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/1f420.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/1f420.svg')
-rw-r--r-- | public/emoji/1f420.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f420.svg b/public/emoji/1f420.svg index 0dc45ffe7..ccc11c48d 100644 --- a/public/emoji/1f420.svg +++ b/public/emoji/1f420.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="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="M 2.263,16.966 C 1.823,16.205 0.006,16.003 0,15.248 l 0,0 0,-0.009 c 0.003,-0.326 0.343,-0.755 1.273,-1.375 l 0,0 c -3.102,-2.07 0.45,-2.244 1.223,-3.104 l 0,0 C 5.121,7.841 11.492,4.556 16.787,4.556 l 0,0 c 6.853,0 13.444,5.556 13.444,12.41 l 0,0 c 0,6.853 -5.17,14.479 -13.444,14.479 l 0,0 C 8.513,31.445 4.726,21.228 2.263,16.966"/></clipPath><clipPath id="clipPath60" clipPathUnits="userSpaceOnUse"><path id="path62" 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(8.2314,26)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 6,8 14,10 18,10 19,10 19,9 18,9 17,9 12,7 11,0 10,-7 0,0 0,0"/></g><g transform="translate(7.2314,8)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4,-3 13,-8 18,-8 3,0 2,1 1,1 C 18,-7 10,-4 9,0 8,4 0,0 0,0"/></g><g transform="translate(29,17)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-4.418 3.791,-10 6,-10 8.209,-10 4,-4.418 4,0 4,4.418 8.209,10 6,10 3.791,10 0,4.418 0,0"/></g><g transform="translate(30.2314,16.9658)" id="g32"><path id="path34" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.854 -6.591,-12.41 -13.445,-12.41 -5.294,0 -11.666,3.285 -14.291,6.205 -0.773,0.859 -4.325,1.034 -1.222,3.102 -3.103,2.069 0.359,2.012 0.989,3.103 2.463,4.263 6.251,14.479 14.524,14.479 C -5.171,14.479 0,6.854 0,0"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(19.001,17)" id="g44"><path id="path46" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.012,0 -0.023,0 -0.034,0.001 -0.586,0.019 -1.019,0.481 -1,1.033 -0.751,8.573 6.294,11.781 6.594,11.914 7.1,12.141 7.689,11.91 7.913,11.405 8.137,10.901 7.91,10.311 7.406,10.086 7.153,9.973 1.206,7.236 0.998,0.967 0.98,0.426 0.536,0 0,0"/></g><g transform="translate(24.001,19)" id="g48"><path id="path50" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.066,0 -0.131,0.006 -0.197,0.02 -0.738,0.128 -1.09,0.655 -0.982,1.196 -0.064,5.787 3.986,7 5.999,7 c 0.553,0 1,-0.448 1,-1 C 6.999,5.449 6.554,5.002 6.003,5 5.83,4.999 1.802,4.915 0.979,0.804 0.885,0.329 0.467,0 0,0"/></g><g transform="translate(14,15)" id="g52"><path id="path54" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 0,12.598 10.605,15.926 10.713,15.958 0.529,0.158 1.086,-0.142 1.245,-0.671 0.158,-0.529 -0.142,-1.086 -0.67,-1.245 C 9.881,14.917 1,12.06 1,1 1,0.447 0.552,0 0,0"/></g></g></g><g id="g56"><g clip-path="url(#clipPath60)" id="g58"><g transform="translate(11,20.5)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M8.231 10c6-8 14-10 18-10 1 0 1 1 0 1s-6 2-7 9-11 0-11 0zm-1 18c4 3 13 8 18 8 3 0 2-1 1-1s-9-3-10-7-9 0-9 0z"/><path fill="#FFCC4D" d="M35 9c-1.611 0-4.059 2.972-5.268 6.294-1.475-5.62-6.166-10.739-12.945-10.739-8.273 0-12.061 10.216-14.524 14.479-.629 1.091-4.091 1.034-.989 3.103-3.103 2.068.449 2.243 1.222 3.103 2.625 2.92 8.997 6.205 14.291 6.205 5.655 0 11.12-3.786 12.863-8.958C30.828 25.896 33.353 29 35 29c2.209 0-2-5.582-2-10s4.209-10 2-10z"/><g fill="#F4900C"><path d="M18.001 17.967c-.019.552.414 1.015.966 1.032l.034.001c.536 0 .98-.426.998-.967.201-6.065 5.758-8.816 6.35-9.092-.466-.525-.968-1.018-1.51-1.467-1.885 1.057-6.634 4.323-6.838 10.493zm5.018-2.163c-.108.542.243 1.068.784 1.177.067.013.132.019.198.019.467 0 .885-.329.98-.804.516-2.581 2.296-3.574 3.592-3.956-.305-.609-.645-1.202-1.028-1.768-1.877.691-3.908 2.246-4.526 5.332z"/><path d="M13 20c0 .553.448 1 1 1s1-.447 1-1c0-8.97 5.841-12.544 8.266-13.641-.693-.419-1.424-.785-2.205-1.067C17.888 7.169 13 11.446 13 20z"/></g><circle fill="#292F33" cx="9.5" cy="15.5" r="1.5"/></svg> \ No newline at end of file |