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/1f1f1-1f1fe.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/1f1f1-1f1fe.svg')
-rw-r--r-- | public/emoji/1f1f1-1f1fe.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f1-1f1fe.svg b/public/emoji/1f1f1-1f1fe.svg index 74add1f6f..c6c12ed66 100644 --- a/public/emoji/1f1f1-1f1fe.svg +++ b/public/emoji/1f1f1-1f1fe.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(18,21.25)" id="g20"><path id="path22" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.902,0 1.718,-0.368 2.307,-0.961 -0.465,0.335 -1.033,0.535 -1.65,0.535 -1.559,0 -2.824,-1.264 -2.824,-2.824 0,-1.56 1.265,-2.824 2.824,-2.824 0.617,0 1.185,0.2 1.65,0.535 C 1.718,-6.132 0.902,-6.5 0,-6.5 c -1.795,0 -3.25,1.455 -3.25,3.25 C -3.25,-1.455 -1.795,0 0,0 m 3.25,-0.952 1.032,-1.42 1.67,0.542 -1.032,-1.42 1.032,-1.42 -1.67,0.542 -1.032,-1.42 0,1.756 -1.67,0.542 1.67,0.543 0,1.755 z M -18,-9.25 l 36,0 0,12 -36,0 0,-12 z"/></g><g transform="translate(32,31)" id="g24"><path id="path26" style="fill:#e70013;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-3 36,0 0,3 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(32,5)" id="g28"><path id="path30" style="fill:#239e46;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,1.791 -4,4 L -32,7 4,7 4,4 C 4,1.791 2.209,0 0,0"/></g><g transform="translate(18,14.75)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.902,0 1.718,0.368 2.307,0.961 1.842,0.626 1.274,0.426 0.657,0.426 c -1.559,0 -2.824,1.264 -2.824,2.824 0,1.56 1.265,2.824 2.824,2.824 0.617,0 1.185,-0.2 1.65,-0.535 C 1.718,6.132 0.902,6.5 0,6.5 -1.795,6.5 -3.25,5.045 -3.25,3.25 -3.25,1.455 -1.795,0 0,0"/></g><g transform="translate(21.25,17.4575)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-1.756 1.032,-0.335 2.702,-0.878 1.67,0.542 2.702,1.963 1.032,1.42 0,2.841 0,1.085 -1.67,0.542 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#141414" d="M0 24h36V12H0v12zm21.25-8.298l1.032 1.42 1.67-.542L22.92 18l1.032 1.42-1.67-.542-1.032 1.42v-1.756L19.58 18l1.67-.543v-1.755zM18 14.75c.902 0 1.718.368 2.307.961-.464-.335-1.033-.535-1.649-.535-1.56 0-2.824 1.264-2.824 2.824s1.264 2.824 2.824 2.824c.617 0 1.185-.2 1.649-.535-.589.593-1.405.961-2.307.961-1.795 0-3.25-1.455-3.25-3.25s1.455-3.25 3.25-3.25z"/><path fill="#E70013" d="M32 5H4C1.791 5 0 6.791 0 9v3h36V9c0-2.209-1.791-4-4-4z"/><path fill="#239E46" d="M32 31H4c-2.209 0-4-1.791-4-4v-3h36v3c0 2.209-1.791 4-4 4z"/><path fill="#FFF" d="M18 21.25c.902 0 1.718-.368 2.307-.961-.464.335-1.033.535-1.649.535-1.56 0-2.824-1.264-2.824-2.824s1.264-2.824 2.824-2.824c.617 0 1.185.2 1.649.535-.589-.593-1.405-.961-2.307-.961-1.795 0-3.25 1.455-3.25 3.25s1.455 3.25 3.25 3.25z"/><path fill="#FFF" d="M21.25 18.542v1.756l1.032-1.42 1.67.542L22.92 18l1.032-1.42-1.67.542-1.032-1.42v1.755L19.58 18z"/></svg> \ No newline at end of file |