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/1f1f5-1f1e6.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/1f1f5-1f1e6.svg')
-rw-r--r-- | public/emoji/1f1f5-1f1e6.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f5-1f1e6.svg b/public/emoji/1f1f5-1f1e6.svg index aa4edaa8f..4fc55f5b0 100644 --- a/public/emoji/1f1f5-1f1e6.svg +++ b/public/emoji/1f1f5-1f1e6.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 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 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"><path id="path20" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 18,31 0,31 0,18 18,18 18,31 Z"/><path id="path22" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 18,5 36,5 36,18 18,18 18,5 Z"/><g transform="translate(9.6735,25.427)" id="g24"><path id="path26" style="fill:#005293;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.674,2.073 -1.347,0 -3.527,0 -1.763,-1.281 -2.437,-3.354 -0.674,-2.073 1.09,-3.354 0.416,-1.281 2.18,0 0,0 Z"/></g><path id="path28" style="fill:#005293;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,5 18,5 18,18 0,18 0,5 Z"/><path id="path30" style="fill:#d21034;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,18 18,0 0,13 -18,0 0,-13 z"/><g transform="translate(25.9102,11.1459)" id="g32"><path id="path34" style="fill:#d21034;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.674,-2.073 1.09,-0.792 2.853,-2.073 2.18,0 3.943,1.281 1.763,1.281 1.09,3.354 0.416,1.281 -1.763,1.281 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EEE" d="M18 18V5H4C1.791 5 0 6.791 0 9v9h18zm0 0v13h14c2.209 0 4-1.791 4-4v-9H18z"/><path fill="#005293" d="M18 18v13H4c-2.209 0-4-1.791-4-4v-9h18z"/><path fill="#D21034" d="M18 18V5h14c2.209 0 4 1.791 4 4v9H18z"/><path fill="#005293" d="M9.674 10.573L9 8.5l-.674 2.073H6.147l1.763 1.281-.673 2.073L9 12.646l1.763 1.281-.673-2.073 1.763-1.281z"/><path fill="#D21034" d="M25.91 24.854l-.673 2.073L27 25.646l1.763 1.281-.673-2.073 1.763-1.281h-2.179L27 21.5l-.674 2.073h-2.179z"/></svg> \ No newline at end of file |