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/1f364.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/1f364.svg')
-rw-r--r-- | public/emoji/1f364.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f364.svg b/public/emoji/1f364.svg index 3bc480d47..913042216 100644 --- a/public/emoji/1f364.svg +++ b/public/emoji/1f364.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 15.85,33.617 c -0.063,-0.176 -0.302,-0.519 -0.532,-0.851 l 0,0 c -0.679,-0.978 -1.609,-2.319 -1.212,-3.52 l 0,0 c 0.221,-0.669 0.814,-1.17 1.763,-1.491 l 0,0 c 1.893,-0.639 5.829,-3.862 6.601,-7.744 l 0,0 c 0.215,-1.077 0.156,-2.112 -0.144,-3.105 l 0,0 c -1.624,3.03 -4.566,4.937 -8.157,4.937 l 0,0 c -5.814,0 -9.528,-4.786 -9.528,-10.67 l 0,0 c 0,-4.955 3.714,-10.671 9.528,-10.671 l 0,0 c 0.028,0 0.057,0.004 0.086,0.004 l 0,0 0.091,-0.006 c 0.602,-0.043 1.608,-0.113 2.826,-0.113 l 0,0 c 6.086,0 13.838,1.729 16.201,9.968 l 0,0 c 1.555,5.419 0.422,11.69 -2.959,16.365 l 0,0 c -2.266,3.135 -6.545,6.935 -14.066,7.232 l 0,0 -0.372,0.016 -0.126,-0.351 z"/></clipPath><clipPath id="clipPath52" clipPathUnits="userSpaceOnUse"><path id="path54" d="M 4.765,35.562 C 3.344,35.497 2.257,34.771 1.997,33.714 l 0,0 c -0.122,-0.498 -0.21,-1.771 1.624,-2.84 l 0,0 C 4.172,30.552 4.508,30.213 4.52,29.966 l 0,0 C 4.531,29.732 4.259,29.255 3.458,28.683 l 0,0 C 2.664,28.116 2.339,27.24 2.608,26.399 l 0,0 c 0.331,-1.033 1.468,-1.727 2.828,-1.727 l 0,0 c 0.744,0 1.513,0.196 2.285,0.581 l 0,0 c 1.996,0.998 4.682,1.643 6.844,1.643 l 0,0 c 1.066,0 1.971,-0.15 2.689,-0.445 l 0,0 c 0.363,-0.149 0.716,-0.225 1.053,-0.225 l 0,0 0.001,0 c 0.619,0 1.172,0.249 1.599,0.721 l 0,0 c 1.335,1.477 1.058,4.981 0.988,5.668 l 0,0 c -0.043,0.434 -0.357,0.791 -0.782,0.889 l 0,0 C 18.518,33.872 7.344,35.565 4.96,35.565 l 0,0 -0.195,-0.003 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(30.4141,26.7202)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.266,3.135 -6.545,6.934 -14.066,7.232 l -0.372,0.016 -0.126,-0.351 c -0.064,-0.176 -0.302,-0.519 -0.532,-0.851 -0.679,-0.979 -1.61,-2.319 -1.213,-3.52 0.222,-0.669 0.815,-1.171 1.764,-1.491 1.893,-0.639 5.829,-3.862 6.602,-7.745 0.214,-1.076 0.155,-2.111 -0.145,-3.105 -1.624,3.031 -4.566,4.938 -8.158,4.938 -5.814,0 -9.527,-4.787 -9.527,-10.67 0,-5.082 3.713,-10.671 9.527,-10.671 0.03,0 0.058,0.004 0.087,0.004 l 0.091,-0.006 c 0.602,-0.043 1.608,-0.114 2.826,-0.114 6.086,0 13.838,1.73 16.201,9.968 C 4.514,-10.946 3.381,-4.675 0,0"/></g><g transform="translate(5.436,24.6714)" id="g24"><path id="path26" style="fill:#ff839b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.36,0 -2.497,0.694 -2.828,1.728 -0.269,0.841 0.056,1.717 0.85,2.284 0.801,0.571 1.072,1.048 1.062,1.283 -0.012,0.246 -0.348,0.586 -0.899,0.907 -1.833,1.069 -1.747,2.343 -1.624,2.84 0.26,1.058 1.346,1.783 2.768,1.848 l 0.195,0.004 c 2.384,0 13.559,-1.693 15.153,-2.061 C 15.102,8.734 15.416,8.377 15.459,7.944 15.53,7.257 11.824,6.064 14.471,2.276 14.836,1.754 13.491,1.554 12.872,1.554 l -10e-4,0 C 12.535,1.554 12.18,1.63 11.818,1.779 11.1,2.075 10.195,2.225 9.129,2.225 6.967,2.225 4.281,1.58 2.285,0.581 1.513,0.196 0.744,0 0,0"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(21.7061,18.1172)" id="g36"><path id="path38" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.286,-3.431 4.234,-10.84 -2.795,-12.915 -0.17,-0.636 2.905,-1.47 5.61,1.461 C 5.864,-8.151 6.055,0.169 -0.974,5.843 -5.547,7.156 0,0 0,0"/></g><g transform="translate(31.2539,12.9512)" id="g40"><path id="path42" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.655,0.752 4.002,2.667 4.764,4.509 5.526,6.351 7.241,3.049 5.526,1.461 4.446,0.381 1.207,-1.017 -0.381,-1.207 -1.969,-1.398 -1.398,-0.636 0,0"/></g><g transform="translate(30.873,29.5918)" id="g44"><path id="path46" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.381,-3.176 1.334,-7.558 -0.89,-9.591 -2.222,-2.032 0.101,-1.333 1.398,-0.508 2.096,1.334 2.668,4.319 1.969,6.098 C 1.778,-2.223 0,0 0,0"/></g></g></g><g id="g48"><g clip-path="url(#clipPath52)" id="g50"><g transform="translate(1.8462,32.5137)" id="g56"><path id="path58" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.35,-3.684 12.576,-1.313 0.212,-5.674 -4.891,-6.923 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M30.414 9.28c-2.266-3.135-6.545-6.934-14.066-7.232l-.372-.015-.126.35c-.063.176-.302.519-.532.851-.679.979-1.609 2.319-1.212 3.52.221.669.814 1.17 1.764 1.491 1.893.639 5.829 3.862 6.602 7.745.215 1.076.155 2.111-.144 3.105-1.624-3.031-4.566-4.938-8.158-4.938-5.814 0-9.527 4.787-9.527 10.67 0 5.082 3.713 10.671 9.527 10.671.029 0 .058-.004.086-.004l.091.006c.602.043 1.608.113 2.826.113 6.086 0 13.838-1.729 16.201-9.968 1.554-5.419.421-11.69-2.96-16.365z"/><path d="M18.911 30.798c-.17.636 2.905 1.47 5.61-1.461 3.049-3.303 3.239-11.623-3.789-17.297-.071-.021-.133-.033-.2-.049.909 1.172 1.648 2.539 1.938 3.999.208 1.04.154 2.04-.12 3.004 1.932 3.715 2.909 9.93-3.439 11.804zm11.962-6.542c.759-.091 1.894-.461 2.991-.937.104-.723.164-1.455.182-2.19-.908.835-1.941 1.532-2.793 1.92-1.397.636-1.968 1.397-.38 1.207zm-.89-8.257c-2.223 2.032.101 1.333 1.398.508.761-.484 1.315-1.189 1.687-1.972-.429-1.311-.995-2.578-1.693-3.769.118 2.073-.098 4.051-1.392 5.233z" fill="#F4900C"/><path fill="#FF839B" d="M20.896 3.385c-.043-.434-.357-.791-.782-.889C18.519 2.128 7.344.435 4.96.435l-.195.003c-1.421.065-2.507.79-2.768 1.848-.123.498-.209 1.771 1.624 2.84.551.322.887.661.899.908.01.235-.261.712-1.062 1.283-.794.567-1.119 1.442-.85 2.284.331 1.033 1.467 1.728 2.828 1.728.744 0 1.513-.196 2.285-.582 1.996-.999 4.682-1.643 6.844-1.643 1.066 0 1.971.15 2.689.445.362.149.717.225 1.053.225.619 0 1.965-.2 1.6-.722-2.647-3.787 1.059-4.98.989-5.667z"/><path fill="#EA596E" d="M2.533 4.243c.252.297.597.597 1.088.883.551.322.887.661.899.908.01.235-.261.712-1.062 1.283-.604.431-.932 1.041-.938 1.679 10.696-3.803 3.099-2.197.013-4.753z"/></svg> \ No newline at end of file |