about summary refs log tree commit diff
path: root/public/emoji/1f35c.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/1f35c.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/1f35c.svg')
-rw-r--r--public/emoji/1f35c.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f35c.svg b/public/emoji/1f35c.svg
index f5371889f..e9fc9700d 100644
--- a/public/emoji/1f35c.svg
+++ b/public/emoji/1f35c.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></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(18,0)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -14.958,0 -17,14 -17,18 l 34,0 C 17,16 15.042,0 0,0"/></g><g transform="translate(35,18.9443)" id="g24"><path id="path26" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.216 -7.611,-9.444 -17,-9.444 -9.389,0 -17,4.228 -17,9.444 0,5.216 7.611,8.444 17,8.444 C -7.611,8.444 0,5.216 0,0"/></g><g transform="translate(19.5,3)" id="g28"><path id="path30" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.5,0 C -2.776,0 -3,0.224 -3,0.5 -3,0.776 -2.776,1 -2.5,1 l 2,0 0,3 -4,0 0,-1 3,0 C -1.224,3 -1,2.776 -1,2.5 -1,2.224 -1.224,2 -1.5,2 L -5,2 c -0.276,0 -0.5,0.224 -0.5,0.5 l 0,2 C -5.5,4.776 -5.276,5 -5,5 L 0,5 C 0.276,5 0.5,4.776 0.5,4.5 l 0,-4 C 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(25,4)" id="g32"><path id="path34" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.198,0 -0.386,0.119 -0.464,0.314 -0.102,0.256 0.022,0.547 0.278,0.65 L 1.99,1.835 1.925,4.084 -2,3.109 -2,2.16 C -1.266,2.366 -0.042,2.713 0.858,2.98 1.12,3.056 1.401,2.907 1.48,2.642 1.558,2.377 1.406,2.099 1.142,2.021 -0.236,1.613 -2.365,1.019 -2.365,1.019 -2.52,0.977 -2.678,1.008 -2.803,1.102 -2.927,1.196 -3,1.344 -3,1.5 l 0,2 c 0,0.23 0.156,0.43 0.38,0.485 L 2.286,5.204 C 2.43,5.24 2.589,5.208 2.708,5.117 2.829,5.025 2.901,4.885 2.906,4.733 L 3,1.515 C 3.006,1.305 2.881,1.113 2.686,1.036 l -2.5,-1 C 0.125,0.012 0.062,0 0,0"/></g><g transform="translate(29.5732,6.7119)" id="g36"><path id="path38" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.112,0 -0.201,0.03 -0.288,0.078 -0.158,0.088 -0.285,0.31 -0.285,0.491 l 0,2.563 c 0,0.184 0.102,0.354 0.265,0.441 C 0.282,3.887 0.972,4.3 1.53,4.634 1.92,4.867 2.248,5.064 2.441,5.167 2.59,5.245 2.771,5.244 2.917,5.164 3.066,5.083 3.162,4.933 3.175,4.764 3.209,4.326 3.062,3.219 3.031,3.001 3.011,2.848 2.919,2.712 2.784,2.635 L 1.581,1.947 C 1.343,1.815 1.036,1.894 0.898,2.134 0.762,2.373 0.845,2.679 1.085,2.816 L 2.072,3.38 C 2.09,3.52 2.107,3.673 2.124,3.824 2.098,3.809 2.07,3.792 2.044,3.776 1.554,3.483 0.966,3.131 0.427,2.834 l 0,-1.625 C 0.6,1.303 0.834,1.439 1.15,1.636 L 1.489,1.257 1.679,0.786 C 0.73,0.197 0.288,0 0,0"/></g><g transform="translate(11.875,3.7187)" id="g40"><path id="path42" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.051,0 -0.102,0.008 -0.152,0.023 l -3.219,1.032 c -0.263,0.085 -0.408,0.366 -0.324,0.629 0.084,0.263 0.367,0.404 0.629,0.324 L -0.481,1.18 -0.417,3.535 -3.273,4.371 -3.299,3.636 -1.714,3.099 C -1.453,3.01 -1.313,2.727 -1.401,2.465 -1.49,2.203 -1.773,2.065 -2.036,2.151 l -1.937,0.657 c -0.209,0.071 -0.347,0.27 -0.339,0.491 l 0.062,1.75 c 0.006,0.154 0.082,0.298 0.208,0.388 0.125,0.09 0.283,0.118 0.433,0.074 L 0.234,4.386 C 0.452,4.322 0.6,4.119 0.594,3.893 L 0.5,0.486 C 0.496,0.329 0.417,0.183 0.289,0.092 0.204,0.031 0.102,0 0,0"/></g><g transform="translate(5.8437,6.5)" id="g44"><path id="path46" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.091,0 -0.181,0.024 -0.262,0.074 l -1.375,0.844 c -0.235,0.144 -0.309,0.452 -0.164,0.687 0.144,0.236 0.451,0.311 0.688,0.165 l 0.608,-0.374 -0.009,1.624 -1.33,0.75 0,-0.425 0.743,-0.449 C -0.865,2.754 -0.789,2.447 -0.931,2.211 -1.074,1.975 -1.38,1.899 -1.618,2.041 l -0.984,0.594 c -0.15,0.09 -0.242,0.253 -0.242,0.428 l 0,1.562 c 0,0.178 0.094,0.342 0.248,0.432 0.153,0.089 0.343,0.091 0.498,0.004 L 0.23,3.748 C 0.386,3.66 0.483,3.495 0.484,3.315 L 0.5,0.503 C 0.501,0.321 0.403,0.153 0.246,0.064 0.169,0.021 0.084,0 0,0"/></g><g transform="translate(33,18)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.866 -6.716,-7 -15,-7 -8.284,0 -15,3.134 -15,7 0,3.866 6.716,7 15,7 C -6.716,7 0,3.866 0,0"/></g><g transform="translate(22,12)" id="g52"><path id="path54" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.18,0 -2.122,0.196 -2.801,0.584 -3.568,1.023 -4.008,1.727 -4.008,2.517 -4.008,4.372 -1.668,6 1,6 1.553,6 2,5.552 2,5 2,4.447 1.553,4 1,4 -0.872,4 -2.008,2.97 -2.008,2.517 -2.008,2.44 -1.855,2.348 -1.809,2.32 -1.599,2.201 -1.085,2 0,2 2.404,2 5,3.529 5,6 5,6.721 4.061,7.183 3.657,7.348 1.638,8.173 -1.634,7.927 -3.287,6.244 -4.727,4.776 -7.079,4.288 -9.577,4.942 c -1.538,0.402 -3.319,1.339 -3.705,2.761 -0.197,0.725 0.008,1.437 0.575,2.004 C -10.414,12 -6.129,12 -3,12 c 0.553,0 1,-0.448 1,-1 0,-0.552 -0.447,-1 -1,-1 -2.779,0 -6.586,0 -8.293,-1.707 -0.052,-0.053 -0.064,-0.081 -0.064,-0.082 0.024,-0.156 0.571,-0.763 1.807,-1.189 1.571,-0.541 3.676,-0.559 4.837,0.623 2.318,2.361 6.46,2.644 9.127,1.554 C 6.058,8.527 7,7.361 7,6 7,2.294 3.366,0 0,0"/></g><g transform="translate(15,12)" id="g56"><path id="path58" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7.605,0 -10,5.456 -10,7 0,0.552 0.448,1 1,1 0.551,0 0.998,-0.445 1,-0.995 C -7.964,6.342 -6.299,2 0,2 0.552,2 1,1.553 1,1 1,0.447 0.552,0 0,0"/></g><g transform="translate(35.0918,32.9468)" id="g60"><path id="path62" style="fill:#aa695b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -23.005,-0.886 c -0.55,-0.049 -1.036,0.357 -1.085,0.907 -0.05,0.55 0.356,1.036 0.906,1.085 L -0.269,2.988 C 0.282,3.038 0.768,2.632 0.817,2.082 0.866,1.532 0.551,0.05 0,0"/></g><g transform="translate(35,28)" id="g64"><path id="path66" style="fill:#aa695b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -23,1 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,3 C 0.553,3 1,2.552 1,2 1,1.448 0.553,0 0,0"/></g><g transform="translate(14,21)" id="g68"><path id="path70" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,12 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(18,19)" id="g72"><path id="path74" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,15 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L 1,1 C 1,0.448 0.552,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M18 36C3.042 36 1 22 1 18h34c0 2-1.958 18-17 18z"/><path fill="#99AAB5" d="M35 17.056c0 5.216-7.611 9.444-17 9.444S1 22.271 1 17.056c0-5.216 7.611-8.444 17-8.444 9.389-.001 17 3.228 17 8.444z"/><path fill="#EA596E" d="M19.5 33H17c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2v-3h-4v1h3c.276 0 .5.224.5.5s-.224.5-.5.5h-3.5c-.276 0-.5-.224-.5-.5v-2c0-.276.224-.5.5-.5h5c.276 0 .5.224.5.5v4c0 .276-.224.5-.5.5zm5.5-1c-.198 0-.386-.119-.464-.315-.103-.256.021-.547.278-.649l2.176-.871-.065-2.249-3.925.975v.949c.734-.206 1.958-.553 2.858-.819.262-.076.543.072.621.338.078.265-.073.543-.338.621-1.378.407-3.507 1.002-3.507 1.002-.154.042-.312.011-.438-.083-.123-.095-.196-.243-.196-.399v-2c0-.229.156-.43.38-.485l4.906-1.219c.144-.036.303-.004.422.087.121.092.193.232.198.384L28 30.485c.006.21-.119.401-.315.479l-2.5 1c-.06.024-.123.036-.185.036zm4.573-2.712c-.112 0-.201-.03-.288-.078-.158-.088-.285-.31-.285-.491v-2.562c0-.185.103-.354.266-.441.59-.313 1.279-.726 1.838-1.06.39-.233.718-.43.911-.533.149-.078.329-.077.476.003.148.081.245.231.258.4.034.438-.113 1.545-.144 1.763-.021.153-.112.289-.247.366l-1.203.688c-.238.132-.545.054-.683-.186-.137-.239-.054-.545.186-.683l.987-.564c.018-.14.035-.293.052-.444l-.08.048c-.49.293-1.078.646-1.617.942v1.625c.173-.094.407-.229.724-.427l.339.379.19.471c-.949.587-1.392.784-1.68.784zm-17.698 2.993c-.051 0-.102-.008-.152-.023l-3.219-1.031c-.263-.085-.408-.366-.324-.629.084-.264.367-.404.628-.324l2.585.828.065-2.356-2.856-.836-.026.735 1.585.537c.261.089.401.372.313.634-.089.262-.372.399-.634.313l-1.938-.656c-.209-.071-.347-.271-.339-.491l.062-1.75c.005-.154.082-.298.207-.388.125-.091.284-.118.433-.074l3.844 1.125c.218.063.365.267.359.493l-.094 3.406c-.004.157-.083.304-.211.395-.084.061-.186.092-.288.092zM5.844 29.5c-.091 0-.181-.024-.262-.074l-1.375-.844c-.235-.145-.309-.452-.165-.688.144-.235.451-.311.688-.164l.608.373-.008-1.623L4 25.73v.425l.743.448c.236.143.312.449.17.686-.143.236-.449.311-.687.17l-.984-.594c-.15-.09-.242-.253-.242-.427v-1.562c0-.178.094-.342.248-.432.153-.09.343-.092.498-.004l2.328 1.312c.156.088.253.253.254.433l.016 2.812c.001.182-.097.35-.254.438-.077.044-.162.065-.246.065z"/><ellipse fill="#FFAC33" cx="18" cy="18" rx="15" ry="7"/><path fill="#FFD983" d="M22 24c-1.18 0-2.122-.196-2.801-.584-.767-.438-1.208-1.143-1.208-1.933C17.992 19.628 20.332 18 23 18c.553 0 1 .448 1 1 0 .553-.447 1-1 1-1.872 0-3.008 1.03-3.008 1.483 0 .076.152.169.199.196.21.12.724.321 1.809.321 2.404 0 5-1.529 5-4 0-.721-.94-1.183-1.343-1.348-2.02-.826-5.291-.579-6.944 1.104-1.441 1.467-3.792 1.956-6.29 1.301-1.538-.402-3.319-1.338-3.705-2.761-.196-.725.008-1.436.575-2.004C11.586 12 15.871 12 19 12c.553 0 1 .448 1 1s-.447 1-1 1c-2.779 0-6.586 0-8.293 1.707-.052.053-.064.081-.064.082.023.157.571.764 1.807 1.189 1.571.541 3.676.559 4.837-.623 2.319-2.361 6.461-2.644 9.128-1.554C28.058 15.473 29 16.639 29 18c0 3.706-3.634 6-7 6zm-7 0c-7.605 0-10-5.456-10-7 0-.552.448-1 1-1 .551 0 .998.445 1 .995.036.663 1.701 5.005 8 5.005.552 0 1 .447 1 1s-.448 1-1 1z"/><path fill="#AA695B" d="M35.092 3.053l-23.005.886c-.55.049-1.036-.356-1.085-.907-.049-.55.356-1.036.906-1.085L34.824.066c.551-.05 1.036.356 1.086.906.048.549-.267 2.031-.818 2.081zM35 8L12 7c-.552 0-1-.448-1-1s.448-1 1-1h23c.553 0 1 .448 1 1s-.447 2-1 2z"/><path fill="#FFD983" d="M14 15c-.552 0-1-.448-1-1V2c0-.552.448-1 1-1s1 .448 1 1v12c0 .552-.448 1-1 1zm4 2c-.552 0-1-.448-1-1V1c0-.552.448-1 1-1s1 .448 1 1v15c0 .552-.448 1-1 1z"/></svg>
\ No newline at end of file