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/1f443-1f3fc.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/1f443-1f3fc.svg')
-rw-r--r-- | public/emoji/1f443-1f3fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f443-1f3fc.svg b/public/emoji/1f443-1f3fc.svg index dc165861c..e953ffde5 100644 --- a/public/emoji/1f443-1f3fc.svg +++ b/public/emoji/1f443-1f3fc.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="clipPath36" clipPathUnits="userSpaceOnUse"><path id="path38" d="M 18,36 C 14.343,36 10.689,22.308 10.088,12.996 l 0,0 C 10.059,12.996 10.029,13 10,13 l 0,0 C 6.133,13 3,8.986 3,6.5 l 0,0 C 3,4.174 8.257,3.136 12.21,1.372 l 0,0 C 13.472,0.276 15.341,0 18,0 l 0,0 c 2.253,0 3.941,0.266 5.173,1.081 l 0,0 C 27.17,3.027 33,4.05 33,6.5 l 0,0 C 33,8.986 29.867,13 26,13 l 0,0 c -0.019,0 -0.04,-0.003 -0.058,-0.003 l 0,0 C 25.441,22.251 21.721,36 18,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(33,6.5)" id="g20"><path id="path22" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.485 -3.134,6.5 -7,6.5 -7.019,6.5 -7.04,6.497 -7.059,6.497 -7.559,15.751 -11.278,29.5 -15,29.5 c -3.657,0 -7.311,-13.691 -7.912,-23.004 -0.028,0 -0.06,0.004 -0.088,0.004 -3.866,0 -7,-4.015 -7,-6.5 0,-2.326 5.257,-3.364 9.21,-5.128 1.262,-1.096 3.132,-1.372 5.79,-1.372 2.253,0 3.941,0.267 5.173,1.081 C -5.83,-3.474 0,-2.45 0,0"/></g><g transform="translate(26,6)" id="g24"><path id="path26" style="fill:#c68f6a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.544,-0.098 0.137,1 0.137,3.722 0.137,5 0,6 0,7 1,7 2.105,7 2.105,4.077 2.105,2.421 0.544,0.099 0,0"/></g><g transform="translate(9.8936,6)" id="g28"><path id="path30" style="fill:#c68f6a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.544,-0.098 -0.137,1 -0.137,3.722 -0.137,5 0,6 0,7 -1,7 -2.104,7 -2.104,4.077 -2.104,2.421 -0.544,0.099 0,0"/></g></g></g><g id="g32"><g clip-path="url(#clipPath36)" id="g34"><g transform="translate(11.8857,1.5127)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.337,-1.155 -2.171,-1.637 -4.098,-1.076 -6.025,-0.514 -7.313,0.88 -6.976,2.035 -6.639,3.19 -4.804,3.671 -2.878,3.11 -0.951,2.549 0.337,1.155 0,0"/></g><g transform="translate(24.1143,1.5127)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.337,-1.155 2.171,-1.637 4.099,-1.076 6.024,-0.514 7.313,0.88 6.975,2.035 6.639,3.19 4.804,3.671 2.878,3.11 0.951,2.549 -0.337,1.155 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F3D2A2" d="M33 29.5c0-2.485-3.134-6.5-7-6.5l-.059.003C25.441 13.749 21.722 0 18 0c-3.657 0-7.311 13.691-7.912 23.004-.028 0-.06-.004-.088-.004-3.866 0-7 4.015-7 6.5 0 2.326 5.257 3.364 9.21 5.128C13.472 35.724 15.342 36 18 36c2.253 0 3.941-.267 5.173-1.081C27.17 32.974 33 31.95 33 29.5z"/><path fill="#C68F6A" d="M26 30c.544-.099 2.104-2.421 2.104-4.077 0-2.061-.55-2.667-1.224-2.846-.289-.046-.581-.077-.88-.077 0 1 .137 2 .137 3.278 0 2.722-.681 3.82-.137 3.722zM7.789 25.923c0 1.656 1.561 3.979 2.104 4.077.544.098-.137-1-.137-3.722 0-1.275.136-2.274.137-3.271-.349.007-.691.05-1.026.118-.606.229-1.078.889-1.078 2.798z"/><path fill="#662113" d="M9.008 31.377c-1.562-.455-3.049-.216-3.741.503 1.804.892 4.381 1.648 6.618 2.609l.001-.002c.337-1.155-.951-2.549-2.878-3.11zm17.984 0c-1.927.561-3.215 1.955-2.878 3.11l.002.004c2.237-.961 4.814-1.718 6.617-2.611-.691-.719-2.179-.958-3.741-.503z"/></svg> \ No newline at end of file |