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/1f3ca-1f3fd.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/1f3ca-1f3fd.svg')
-rw-r--r-- | public/emoji/1f3ca-1f3fd.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3ca-1f3fd.svg b/public/emoji/1f3ca-1f3fd.svg index 87d970d38..bf9442202 100644 --- a/public/emoji/1f3ca-1f3fd.svg +++ b/public/emoji/1f3ca-1f3fd.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(36,15.6367)" id="g20"><path id="path22" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.352,0.427 -3.842,3.363 -6,3.363 -3,0 -3,7 -4,9 -1,2 -3,4 -3,5 0,1 -3,2 -8,0 -5,-2 -8,-2 -10,-2 -2,0 -3,-2 -4,-4 -1,-2 0,-2 0,-2 1,-1 2,2 4,3 2,1 3,-1 5,0 1.493,0.747 4.658,-0.178 7,0.137 0.794,0.106 1.493,0.356 2,0.863 0,0 0,-8 2,-11 0,0 -1,-1 -2,-4 -1,-3 -2,0 -2,2 0,2 -1,5 -5,7 -1.789,0.895 -5.658,0.683 -7,-2 -2,-4 0,-8 2,-9 2,-1 3,-2 7,-2 1.943,0 17.813,-0.48 22,-0.364 L 0,0 Z"/></g><g transform="translate(8.1816,19.5947)" id="g24"><path id="path26" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.186,1.941 5.633,1.687 8.025,-0.472 7.309,0.901 6.02,2.305 3.818,3.405 c -1.789,0.895 -5.658,0.683 -7,-2 -2,-4 0,-8 2,-9 0.24,-0.119 0.463,-0.239 0.681,-0.356 C -2.314,-5.33 -2.166,-1.926 0,0"/></g><g transform="translate(12,17.5)" id="g28"><path id="path30" style="fill:#aa8052;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.128,0 -0.256,0.049 -0.354,0.146 -0.195,0.196 -0.195,0.512 0,0.708 C 0.78,1.987 1.951,2 2,2 2.276,2 2.5,1.776 2.5,1.5 2.5,1.224 2.276,1 2,1 1.972,0.999 1.179,0.972 0.354,0.146 0.256,0.049 0.128,0 0,0"/></g><g transform="translate(8,14.5)" id="g32"><path id="path34" style="fill:#aa8052;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.128,0 -0.256,0.049 -0.354,0.146 -0.195,0.196 -0.195,0.512 0,0.708 C 0.78,1.987 1.951,2 2,2 2.276,2 2.5,1.776 2.5,1.5 2.5,1.224 2.276,1 2,1 1.972,0.999 1.179,0.972 0.354,0.146 0.256,0.049 0.128,0 0,0"/></g><path id="path36" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,12 0,12 0,0 36,0 36,12 Z"/><g transform="translate(6,12)" id="g38"><path id="path40" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 3,2 7,5 6,3 5,1 4.999,0 7,1 c 2,1 5,2 4,0 -1,-2 2,-1 3,0 1,1 4,0 3,-1 C 16,-1 8,-2 5,-2 2,-2 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D5AB88" d="M36 20.363C34.648 19.937 32.158 17 30 17c-3 0-3-7-4-9s-3-4-3-5-3-2-8 0S7 5 5 5 2 7 1 9s0 2 0 2c1 1 2-2 4-3s3 1 5 0c1.493-.747 4.658.179 7-.136.794-.107 1.493-.357 2-.864 0 0 0 8 2 11 0 0-1 1-2 4s-2 0-2-2-1-5-5-7c-1.789-.894-5.658-.683-7 2-2 4 0 8 2 9s3 2 7 2c1.943 0 17.812.48 22 .364v-6.001z"/><path fill="#4289C1" d="M8.182 16.405c2.186-1.941 5.633-1.688 8.025.472C15.49 15.504 14.201 14.101 12 13c-1.789-.894-5.658-.683-7 2-2 4 0 8 2 9 .239.119.463.239.681.356-1.814-2.621-1.665-6.025.501-7.951z"/><path fill="#AA8052" d="M12 18.5c-.128 0-.256-.049-.354-.146-.195-.195-.195-.512 0-.707C12.78 16.513 13.951 16.5 14 16.5c.276 0 .5.224.5.5s-.224.5-.5.5c-.028 0-.821.028-1.646.854-.098.097-.226.146-.354.146zm-4 3c-.128 0-.256-.049-.354-.146-.195-.195-.195-.512 0-.707C8.78 19.513 9.951 19.5 10 19.5c.276 0 .5.224.5.5s-.224.5-.5.5c-.028.001-.821.028-1.646.854-.098.097-.226.146-.354.146z"/><path fill="#55ACEE" d="M0 24h36v12H0z"/><path fill="#55ACEE" d="M6 24c3-2 7-5 6-3s-1.001 3 1 2c2-1 5-2 4 0s2 1 3 0 4 0 3 1-9 2-12 2-5-2-5-2z"/></svg> \ No newline at end of file |