about summary refs log tree commit diff
path: root/public/emoji/1f38b.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-09 07:05:29 +0200
committerThibaut Girka <thib@sitedethib.com>2018-07-09 07:13:59 +0200
commitd392020da6ff4511a2925b327de23933f374bea3 (patch)
treee86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f38b.svg
parentc699b2d141d7aa910bd81ae5fe881ecec7039395 (diff)
parent1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff)
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'public/emoji/1f38b.svg')
-rw-r--r--public/emoji/1f38b.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f38b.svg b/public/emoji/1f38b.svg
index 80bdcf94a..063638074 100644
--- a/public/emoji/1f38b.svg
+++ b/public/emoji/1f38b.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve" version="1.1" id="svg2"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="m 18.456,18.727 c 0,0 3.078,-12.977 9.304,-16.719 l 0,0 c 1.041,-0.626 2.135,-0.981 2.17,-0.035 l 0,0 c 0.027,0.769 -0.035,3.008 -0.244,3.742 l 0,0 c 0.7,-0.316 2.412,-0.63 3.601,-0.49 l 0,0 c 1.189,0.14 2.554,1.574 1.085,1.644 l 0,0 c -6.331,-0.315 -8.71,13.467 -9.234,15.146 l 0,0 C 23.843,21.42 19.331,19.252 18.456,18.727"/></clipPath><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(21.293,20.542)" id="g20"><path id="path22" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.353,0 -0.694,0.187 -0.877,0.518 -1.88,2.338 -2.258,4.288 -2.562,5.854 -2.644,6.281 -2.723,6.688 -2.81,7.069 -2.933,7.607 -2.596,8.144 -2.058,8.267 -1.515,8.39 -0.982,8.053 -0.86,7.514 -0.769,7.113 -0.686,6.684 -0.598,6.235 -0.307,4.731 0.023,3.028 0.875,1.482 1.142,0.998 0.965,0.391 0.481,0.124 0.328,0.04 0.163,0 0,0"/></g><g transform="translate(18.4561,18.7275)" id="g24"><path id="path26" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.875,0.524 5.387,2.693 6.682,3.288 0.524,-1.679 2.903,-15.462 9.234,-15.146 1.469,-0.07 0.105,-1.504 -1.085,-1.644 -1.188,-0.141 -2.901,0.174 -3.602,0.489 0.21,-0.734 0.272,-2.972 0.245,-3.742 -0.035,-0.945 -1.129,-0.59 -2.169,0.035 C 3.078,-12.978 0,0 0,0"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(18.2119,16.7686)" id="g36"><path id="path38" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.244,0.14 8.43,3.813 8.43,3.813 L 7.171,6.086 c 0,0 -8.15,-3.393 -8.045,-3.393 C -0.77,2.693 0,0 0,0"/></g></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><g transform="translate(18.2119,18.5522)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.135,0.454 6.191,2.764 7.205,3.253 8.22,3.743 7.905,5.597 6.716,5.177 5.526,4.757 0.664,2.414 -0.49,1.924 -1.644,1.435 -0.874,-0.35 0,0"/></g><g transform="translate(6.1948,21.9556)" id="g52"><path id="path54" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.895,1.62 4.242,5.004 7.798,6.138 7.547,5.066 2.734,-2.337 0,0"/></g><g transform="translate(25.5391,31.6143)" id="g56"><path id="path58" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.964,2.299 6.06,-2.512 8.225,-5.55 7.129,-5.639 -1.39,-3.317 0,0"/></g><g transform="translate(3.0835,0.375)" id="g60"><path id="path62" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.829,0 -1.5,0.672 -1.5,1.5 0,0.192 -0.005,0.439 -0.011,0.734 -0.087,4.165 -0.059,16.531 8.428,30.808 0.423,0.712 1.055,1.254 1.766,0.831 C 9.395,33.45 9.006,32.504 8.583,31.792 0.534,18.253 1.406,6.249 1.488,2.297 1.495,1.975 1.5,1.708 1.5,1.5 1.5,0.672 0.829,0 0,0"/></g><g transform="translate(2.082,2.959)" id="g64"><path id="path66" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.787,0 -1.448,0.613 -1.496,1.41 -0.049,0.827 0.58,1.537 1.408,1.587 L 1.995,3.122 C 2.82,3.183 3.532,2.542 3.582,1.715 3.631,0.888 3.001,0.178 2.174,0.128 L 0.091,0.003 C 0.061,0.001 0.03,0 0,0"/></g><g transform="translate(7.71,0.417)" id="g68"><path id="path70" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.095,0 -0.19,0.009 -0.287,0.027 -0.814,0.158 -1.345,0.946 -1.187,1.759 0.035,0.18 0.078,0.448 0.132,0.793 3.4,21.294 13.516,28.269 21.799,30.837 0.799,0.245 2.104,0.36 2.349,-0.43 0.245,-0.792 -0.6,-1.282 -1.391,-1.528 C 13.943,29.142 4.777,21.879 1.621,2.106 1.559,1.719 1.51,1.417 1.471,1.214 1.332,0.497 0.704,0 0,0"/></g><g transform="translate(9.916,27.375)" id="g72"><path id="path74" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.199,0 -0.4,0.04 -0.594,0.123 L -2.719,1.04 c -0.76,0.328 -1.111,1.21 -0.783,1.971 0.328,0.762 1.211,1.112 1.972,0.783 L 0.595,2.878 C 1.355,2.55 1.706,1.667 1.378,0.906 1.133,0.339 0.581,0 0,0"/></g><g transform="translate(5.4595,15.084)" id="g76"><path id="path78" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.125,0 -0.251,0.016 -0.377,0.048 l -2.25,0.583 c -0.802,0.208 -1.284,1.026 -1.076,1.829 0.208,0.801 1.025,1.284 1.828,1.075 L 0.375,2.952 C 1.177,2.744 1.659,1.926 1.451,1.124 1.276,0.448 0.667,0 0,0"/></g><g transform="translate(22.668,27.2505)" id="g80"><path id="path82" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.481,0 -0.955,0.232 -1.245,0.662 L -2.537,2.578 C -3,3.265 -2.818,4.197 -2.132,4.66 -1.445,5.122 -0.513,4.942 -0.049,4.255 L 1.243,2.338 C 1.706,1.651 1.524,0.719 0.838,0.256 0.58,0.083 0.289,0 0,0"/></g><g transform="translate(14.665,17.708)" id="g84"><path id="path86" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.235,0 -0.473,0.056 -0.695,0.172 l -2.542,1.334 c -0.734,0.385 -1.016,1.291 -0.631,2.025 0.385,0.733 1.292,1.016 2.025,0.631 L 0.698,2.829 C 1.432,2.444 1.715,1.537 1.33,0.804 1.062,0.292 0.54,0 0,0"/></g><g transform="translate(9.9175,6.042)" id="g88"><path id="path90" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.127,0 -0.255,0.016 -0.384,0.05 l -2.208,0.583 c -0.801,0.211 -1.279,1.032 -1.067,1.833 0.212,0.801 1.035,1.279 1.833,1.067 L 0.382,2.95 C 1.183,2.739 1.661,1.918 1.449,1.117 1.272,0.444 0.665,0 0,0"/></g><g transform="translate(4.9585,20.792)" id="g92"><path id="path94" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.252,-1.068 -2.834,5.916 -2.417,9.625 -1.542,8.958 3.25,1.541 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M20.416 14.94c-1.003-1.821-1.381-3.77-1.685-5.336-.083-.427 1.579-2.199 1.701-1.66.092.401.175.83.263 1.279.291 1.503.621 3.207 1.473 4.752.267.485-1.569 1.296-1.752.965z"/><path fill="#BE1931" d="M18.456 17.272c.875-.524 5.387-2.693 6.682-3.288.524 1.679 2.903 15.461 9.234 15.146 1.469.069.104 1.504-1.085 1.644-1.189.141-2.901-.174-3.602-.489.21.734.272 2.973.244 3.742-.034.945-1.129.59-2.169-.035-6.226-3.742-9.304-16.72-9.304-16.72z"/><path fill="#A0041E" d="M25.138 13.985c-1.295.595-5.807 2.763-6.682 3.288 0 0 .148.624.445 1.637 1.477-.676 4.959-2.242 6.705-3.026-.222-.916-.375-1.601-.468-1.899z"/><path fill="#FFAC33" d="M18.212 17.448c1.135-.454 6.191-2.764 7.205-3.253 1.015-.49.7-2.344-.489-1.924-1.189.42-6.052 2.763-7.205 3.253-1.155.489-.386 2.273.489 1.924z"/><path fill="#A6D388" d="M6.195 14.044c-1.895-1.62 4.242-5.004 7.798-6.138-.251 1.072-5.064 8.475-7.798 6.138zm19.344-9.658c.964-2.299 6.06 2.512 8.225 5.55-1.096.089-9.615-2.233-8.225-5.55z"/><path fill="#5C913B" d="M3.083 35.625c-.829 0-1.5-.672-1.5-1.5 0-.192-.005-.438-.011-.734C1.486 29.226 1.513 16.86 10 2.583c.424-.712 1.056-1.254 1.767-.831.712.423.323 1.369-.1 2.081C3.618 17.372 4.49 29.376 4.571 33.328c.007.322.012.589.012.797 0 .828-.671 1.5-1.5 1.5z"/><path fill="#3E721D" d="M2.082 33.041c-.787 0-1.448-.613-1.496-1.41-.05-.827.58-1.537 1.407-1.587l2.083-.125c.825-.06 1.538.58 1.587 1.407.05.827-.58 1.537-1.407 1.587l-2.083.125c-.03.002-.061.003-.091.003z"/><path fill="#5C913B" d="M7.71 35.583c-.095 0-.19-.009-.287-.027-.813-.158-1.345-.945-1.187-1.759.035-.18.078-.448.132-.793C9.768 11.71 19.884 4.735 28.167 2.167c.799-.245 2.104-.359 2.349.431.245.791-.6 1.282-1.391 1.527-7.472 2.317-16.638 9.579-19.794 29.352-.062.388-.111.689-.15.892-.139.717-.767 1.214-1.471 1.214z"/><path fill="#3E721D" d="M9.916 8.625c-.199 0-.4-.04-.594-.123l-2.125-.917c-.76-.328-1.111-1.21-.783-1.971.328-.762 1.211-1.111 1.972-.783l2.125.916c.761.328 1.111 1.211.783 1.972-.245.567-.797.906-1.378.906zM5.459 20.916c-.125 0-.251-.016-.377-.048l-2.25-.583c-.802-.208-1.283-1.026-1.076-1.829.208-.802 1.025-1.285 1.829-1.076l2.25.583c.802.208 1.283 1.026 1.076 1.828-.176.677-.785 1.125-1.452 1.125zM22.668 8.75c-.481 0-.955-.232-1.245-.662l-1.292-1.916c-.463-.687-.281-1.619.405-2.082.687-.462 1.619-.282 2.083.405l1.292 1.917c.463.687.281 1.619-.405 2.082-.258.173-.549.256-.838.256zm-8.003 9.542c-.235 0-.473-.056-.695-.172l-2.542-1.333c-.734-.385-1.017-1.292-.631-2.025.385-.733 1.292-1.017 2.025-.631l2.542 1.333c.734.385 1.017 1.292.631 2.025-.268.511-.79.803-1.33.803zM9.917 29.958c-.127 0-.255-.016-.384-.05l-2.208-.583c-.801-.211-1.279-1.032-1.067-1.833.212-.801 1.035-1.279 1.833-1.067l2.208.583c.801.211 1.279 1.032 1.067 1.833-.177.673-.784 1.117-1.449 1.117z"/><path fill="#A6D388" d="M4.958 15.208c-2.252 1.068-2.834-5.917-2.417-9.625.876.667 5.667 8.084 2.417 9.625z"/></svg>
\ No newline at end of file