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/1f1fd.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/1f1fd.svg')
-rw-r--r-- | public/emoji/1f1fd.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1fd.svg b/public/emoji/1f1fd.svg index 9af21b8df..e39fd6d20 100644 --- a/public/emoji/1f1fd.svg +++ b/public/emoji/1f1fd.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:#3b88c3;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(15.3042,18.8135)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.022,6.821 c -0.311,0.403 -0.497,0.868 -0.497,1.365 0,1.364 1.023,2.263 2.357,2.263 0.775,0 1.581,-0.527 2.015,-1.147 L 2.698,3.845 6.542,9.302 c 0.435,0.62 1.241,1.147 2.015,1.147 1.334,0 2.358,-0.899 2.358,-2.263 0,-0.497 -0.186,-0.962 -0.496,-1.365 L 5.395,0 11.534,-8.248 c 0.248,-0.341 0.527,-0.93 0.527,-1.581 0,-1.303 -0.992,-2.17 -2.355,-2.17 -0.838,0 -1.457,0.371 -1.923,1.022 l -5.085,7.07 -5.085,-7.07 c -0.465,-0.651 -1.086,-1.022 -1.923,-1.022 -1.364,0 -2.356,0.867 -2.356,2.17 0,0.651 0.279,1.24 0.527,1.581 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" 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="M15.304 17.187l-5.023-6.821c-.31-.404-.495-.869-.495-1.365 0-1.364 1.023-2.263 2.356-2.263.775 0 1.581.527 2.015 1.147l3.845 5.457 3.845-5.457c.435-.62 1.24-1.147 2.015-1.147 1.334 0 2.358.899 2.358 2.263 0 .496-.186.961-.496 1.364L20.7 17.186l6.139 8.248c.248.341.527.93.527 1.581 0 1.303-.992 2.17-2.355 2.17-.838 0-1.457-.371-1.923-1.022l-5.085-7.069-5.085 7.069c-.465.651-1.085 1.022-1.922 1.022-1.364 0-2.356-.867-2.356-2.17 0-.651.279-1.24.527-1.581l6.137-8.247z"/></svg> \ No newline at end of file |