diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f982.svg | |
parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (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/1f982.svg')
-rw-r--r-- | public/emoji/1f982.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f982.svg b/public/emoji/1f982.svg index c6c3fe93f..582c7223a 100644 --- a/public/emoji/1f982.svg +++ b/public/emoji/1f982.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.7202,9.5967)" id="g20"><path id="path22" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.467,-2.46 1.725,-5.179 1.725,-5.179 0,0 -0.424,3.209 0.806,4.842 C 3.378,0.789 2.778,2.035 2.08,2.129 1.379,2.223 0.263,1.385 0,0"/></g><g transform="translate(15.6255,9.5195)" id="g24"><path id="path26" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.522,-1.884 -4.935,-0.761 -6.144,1.08 -7.352,2.923 -8.626,1.87 -7.426,-0.124 -6.227,-2.116 -2.602,-5.079 1.745,-1.709 5.044,0.846 0.787,0.588 0,0"/></g><g transform="translate(9.6392,9.8936)" id="g28"><path id="path30" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.569,-2.229 -5.719,-1.693 -7.323,2.012 -1.55,3.582 -0.344,6.84 0.463,7.849 0.329,0.41 -0.513,-4.813 2.236,-6.252 1.206,-0.63 -2.444,3.4 -0.694,7.134 0.525,1.119 -0.05,-3.787 3.262,-5.195 C -0.61,4.933 2.301,3.266 0,0"/></g><g transform="translate(12.3135,14.167)" id="g32"><path id="path34" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.594,0.753 1.641,1.554 8.499,1.554 5.125,0 6.58,2.417 8.287,3.019 C 22.624,6.634 20.543,-7.179 10.814,-7.179 1.084,-7.179 -0.798,-1.01 0,0"/></g><g transform="translate(23.1719,15.9189)" id="g36"><path id="path38" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 6.388,1.071 8.032,8.666 5.911,12.581 -1.99,3.674 -6.98,5.398 -11.153,1.959 0.159,-1.029 0.505,-5.625 -3.341,-6.183 1.226,2.513 -2.538,4.374 -1.394,7.632 1.147,3.259 4.257,2.477 4.523,1.632 3.157,2.543 7.24,2.793 8.832,1.21 C 8.125,18.789 11.092,15.597 11.09,13.25 13.828,10.519 12.462,3.775 11.316,3.031 11.828,-1.003 10.655,-4.725 6.204,-6.013 5.436,-6.235 -5.712,-0.958 0,0"/></g><g transform="translate(18.0127,10.4541)" id="g40"><path id="path42" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.06,-1.73 -2.948,-2.413 -4.773,-2.201 -2.481,0.287 -2.49,-1.587 0.117,-1.991 1.497,-0.233 3.867,-0.012 5.635,1.424 C 3.227,-0.939 0.61,1.002 0,0"/></g><g transform="translate(13.9697,7.877)" id="g44"><path id="path46" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.798,-2.984 -2.683,-6.209 -7.073,-4.911 -4.244,1.255 -6.202,4.67 -6.493,6.106 -0.117,0.583 3.816,-3.943 7.066,-2.596 1.423,0.589 -4.736,0.344 -6.713,4.58 -0.594,1.269 3.259,-2.795 6.891,-0.938 C -4.736,3.052 -1.172,4.374 0,0"/></g><g transform="translate(17.0664,13.2754)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.704 -0.571,-1.275 -1.276,-1.275 -0.705,0 -1.276,0.571 -1.276,1.275 0,0.706 0.571,1.276 1.276,1.276 C -0.571,1.276 0,0.706 0,0"/></g><g transform="translate(30.7412,10.4268)" id="g52"><path id="path54" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.428,-2.058 0.53,-5.433 0.53,-5.433 0,0 -0.917,3.104 -2.705,4.096 C -3.406,-0.652 -3.365,0.73 -2.765,1.1 -2.163,1.47 -0.803,1.158 0,0"/></g><g transform="translate(27.8945,8.8477)" id="g56"><path id="path58" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.113,-2.243 -0.265,-5.452 -0.265,-5.452 0,0 -0.457,3.204 -2.081,4.445 -1.119,0.856 -0.878,2.218 -0.23,2.496 C -1.928,1.768 -0.626,1.263 0,0"/></g><g transform="translate(24.6123,7.7627)" id="g60"><path id="path62" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.468,-2.46 -1.725,-5.179 -1.725,-5.179 0,0 0.424,3.209 -0.805,4.842 -0.848,1.126 -0.247,2.372 0.451,2.466 C -1.379,2.223 -0.262,1.385 0,0"/></g><g transform="translate(29.5,21.6748)" id="g64"><path id="path66" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.229,0.013 -1.15,-1.68 -1.082,-2.023 0.226,-1.132 4.853,-1.277 6.07,-0.702 0.908,0.428 1.383,2.55 1.261,3.529 C 4.225,-0.196 0.51,-0.028 0,0"/></g><g transform="translate(33.0674,31.9619)" id="g68"><path id="path70" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.208,-1.04 -2.927,-2.868 -4.142,-3.139 -0.187,-0.042 0.386,-1.495 0.706,-1.685 0.32,-0.19 4.456,1.019 4.63,2.031 C 1.292,-2.228 0.964,-0.556 0,0"/></g><g transform="translate(26.5498,34.75)" id="g72"><path id="path74" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.001,0.226 -0.785,1.018 -2.098,0.93 0.423,-1.477 -0.405,-2.899 -0.814,-3.413 -0.136,-0.171 1.449,-0.508 1.686,-0.429 C -0.798,-2.77 0.003,-1.146 0,0"/></g><g transform="translate(17.896,33.5415)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.541,1.097 -2.416,1.437 -3.791,0.062 -1.375,-1.374 -1.647,-3.166 -0.792,-4.958 0.854,-1.791 1.854,-2.937 1.062,-4.5 2.042,0.271 3.279,2.199 3.625,3.167 C 0.729,-4.479 0.854,-1.729 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#583529" d="M18.72 26.403c-.467 2.46 1.725 5.179 1.725 5.179s-.424-3.209.806-4.842c.847-1.126.247-2.372-.451-2.466-.7-.093-1.817.745-2.08 2.129z"/><path fill="#583529" d="M15.625 26.48c-2.522 1.884-4.935.761-6.144-1.08C8.274 23.558 7 24.61 8.2 26.604c1.199 1.992 4.824 4.955 9.171 1.585 3.299-2.554-.959-2.296-1.746-1.709z"/><path fill="#7C533E" d="M9.639 26.106C8.07 28.335 3.92 27.8 2.316 24.095c-1.55-3.582-.344-6.84.463-7.849.329-.41-.512 4.813 2.237 6.252 1.205.63-2.445-3.399-.695-7.133.525-1.12-.049 3.787 3.263 5.195 1.445.614 4.356 2.281 2.055 5.546zm2.675-4.273c.594-.753 1.641-1.554 8.499-1.554 5.125 0 6.58-2.417 8.287-3.02 5.838-2.061 3.757 11.752-5.972 11.752-9.73.001-11.612-6.168-10.814-7.178z"/><path fill="#7C533E" d="M23.172 20.081c6.388-1.071 8.032-8.666 5.911-12.581-1.99-3.674-6.98-5.397-11.153-1.958.159 1.028.505 5.625-3.341 6.183 1.227-2.514-2.538-4.374-1.394-7.633 1.146-3.259 4.257-2.477 4.523-1.631 3.157-2.543 7.24-2.793 8.832-1.21 4.747.042 7.714 3.234 7.712 5.582 2.738 2.729 1.372 9.473.226 10.217.512 4.034-.661 7.755-5.112 9.043-.769.223-11.916-5.054-6.204-6.012z"/><path fill="#AF7E57" d="M18.013 25.546c-1.06 1.73-2.948 2.413-4.773 2.201-2.481-.287-2.49 1.587.117 1.991 1.498.232 3.868.012 5.635-1.425 2.247-1.829-.369-3.769-.979-2.767z"/><path fill="#AF7E57" d="M13.97 28.123c.798 2.984-2.683 6.209-7.073 4.911-4.244-1.255-6.203-4.67-6.493-6.106-.117-.583 3.816 3.943 7.065 2.597 1.423-.59-4.735-.345-6.713-4.58-.593-1.269 3.259 2.795 6.891.938 1.587-.812 5.151-2.134 6.323 2.24z"/><path fill="#292F33" d="M17.066 22.725c0 .704-.571 1.275-1.276 1.275-.705 0-1.276-.571-1.276-1.275 0-.706.571-1.276 1.276-1.276.705-.001 1.276.57 1.276 1.276z"/><path fill="#AF7E57" d="M30.741 25.573c1.428 2.058.53 5.433.53 5.433s-.917-3.104-2.705-4.096c-1.231-.685-1.19-2.067-.59-2.437.602-.369 1.962-.058 2.765 1.1zm-2.846 1.579c1.113 2.243-.265 5.452-.265 5.452s-.457-3.204-2.081-4.445c-1.119-.856-.878-2.218-.23-2.496.648-.279 1.95.227 2.576 1.489zm-3.283 1.085c.468 2.46-1.725 5.179-1.725 5.179s.424-3.209-.806-4.842c-.848-1.126-.247-2.372.451-2.466.701-.093 1.819.745 2.08 2.129z"/><path fill="#583529" d="M29.5 14.325c-.229-.013-1.15 1.68-1.082 2.023.226 1.132 4.854 1.277 6.07.702.907-.428 1.383-2.55 1.261-3.529-2.024 1-5.739.833-6.249.804zm3.567-10.287c-.208 1.04-2.927 2.868-4.142 3.139-.188.042.386 1.495.705 1.685.32.19 4.456-1.02 4.631-2.031.098-.565-.23-2.237-1.194-2.793zM26.55 1.25c-.001-.226-.785-1.018-2.098-.93.423 1.477-.405 2.898-.814 3.413-.136.171 1.449.508 1.687.429.427-.142 1.228-1.766 1.225-2.912z"/><path fill="#292F33" d="M17.896 2.458c-.542-1.097-2.417-1.437-3.792-.062s-1.646 3.167-.792 4.958c.854 1.792 1.854 2.938 1.062 4.5 2.042-.271 3.279-2.199 3.625-3.167.626-1.749.751-4.499-.103-6.229z"/></svg> \ No newline at end of file |