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/2650.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/2650.svg')
-rw-r--r-- | public/emoji/2650.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2650.svg b/public/emoji/2650.svg index a4d391290..df13efca8 100644 --- a/public/emoji/2650.svg +++ b/public/emoji/2650.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,4)" id="g20"><path id="path22" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(28.5,30)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -11.5,0 c -0.829,0 -1.5,-0.671 -1.5,-1.5 0,-0.829 0.671,-1.5 1.5,-1.5 l 7.879,0 -11.879,-11.879 -3.939,3.94 c -0.586,0.585 -1.536,0.585 -2.122,0 -0.585,-0.586 -0.585,-1.536 0,-2.122 l 3.94,-3.939 -4.94,-4.939 c -0.585,-0.586 -0.585,-1.536 0,-2.122 0.293,-0.293 0.677,-0.439 1.061,-0.439 0.384,0 0.768,0.146 1.061,0.439 l 4.939,4.94 3.939,-3.94 c 0.293,-0.293 0.677,-0.439 1.061,-0.439 0.384,0 0.768,0.146 1.061,0.439 0.585,0.586 0.585,1.536 0,2.122 L -13.379,-17 -1.5,-5.121 -1.5,-13 c 0,-0.828 0.672,-1.5 1.5,-1.5 0.828,0 1.5,0.672 1.5,1.5 l 0,11.5 C 1.5,-0.671 0.828,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FFF" d="M28.5 6H17c-.829 0-1.5.671-1.5 1.5S16.171 9 17 9h7.879L13 20.879 9.061 16.94c-.586-.586-1.535-.586-2.121 0-.586.585-.586 1.536 0 2.121L10.879 23 5.94 27.94c-.586.586-.586 1.535 0 2.121.292.293.676.439 1.06.439s.768-.146 1.061-.44L13 25.121l3.94 3.939c.293.293.677.44 1.06.44s.768-.146 1.06-.44c.586-.586.586-1.535 0-2.121L15.121 23 27 11.121V19c0 .828.672 1.5 1.5 1.5S30 19.828 30 19V7.5c0-.829-.672-1.5-1.5-1.5z"/></svg> \ No newline at end of file |