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/1f319.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/1f319.svg')
-rw-r--r-- | public/emoji/1f319.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f319.svg b/public/emoji/1f319.svg index a05283d37..aba4295ff 100644 --- a/public/emoji/1f319.svg +++ b/public/emoji/1f319.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(30.3115,35.2236)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.688,-18.224 -10.312,-31.224 -29.535,-29.536 8.199,-7.717 21.091,-7.588 29.107,0.429 C 7.589,-21.091 7.719,-8.198 0,0"/></g><g transform="translate(30.7051,20.085)" id="g24"><path id="path26" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.453,-0.454 -0.453,-1.189 0,-1.644 0.454,-0.453 1.189,-0.453 1.644,0 0.454,0.455 0.455,1.19 0,1.644 C 1.189,0.454 0.454,0.454 0,0"/></g><g transform="translate(14.6831,5.7051)" id="g28"><path id="path30" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.682,-0.681 -0.682,-1.783 0,-2.465 0.68,-0.681 1.784,-0.681 2.464,0 0.681,0.682 0.681,1.784 0,2.465 C 1.784,0.682 0.68,0.682 0,0"/></g><g transform="translate(28.6514,7.8516)" id="g32"><path id="path34" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.135,-1.135 -2.974,-1.135 -4.108,0 -1.135,1.135 -1.135,2.975 0,4.107 1.134,1.136 2.973,1.136 4.108,0 C 1.135,2.975 1.135,1.135 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M30.312.776C32 19 20 32 .776 30.312c8.199 7.717 21.091 7.588 29.107-.429C37.9 21.867 38.03 8.975 30.312.776z"/><path d="M30.705 15.915c-.453.454-.453 1.189 0 1.644.454.453 1.189.453 1.643 0 .454-.455.455-1.19 0-1.644-.453-.454-1.189-.454-1.643 0zm-16.022 14.38c-.682.681-.682 1.783 0 2.465.68.682 1.784.682 2.464 0 .681-.682.681-1.784 0-2.465-.68-.682-1.784-.682-2.464 0zm13.968-2.147c-1.135 1.135-2.974 1.135-4.108 0-1.135-1.135-1.135-2.975 0-4.107 1.135-1.136 2.974-1.136 4.108 0 1.135 1.133 1.135 2.973 0 4.107z" fill="#B8C5CD"/></svg> \ No newline at end of file |