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/1f1f2-1f1ed.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/1f1f2-1f1ed.svg')
-rw-r--r-- | public/emoji/1f1f2-1f1ed.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f2-1f1ed.svg b/public/emoji/1f1f2-1f1ed.svg index 9a82f6e4a..6774f9b34 100644 --- a/public/emoji/1f1f2-1f1ed.svg +++ b/public/emoji/1f1f2-1f1ed.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,9)" id="g20"><path id="path22" style="fill:#003893;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,18 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(34.5928,30.0229)" id="g24"><path id="path26" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -33.758,-23.443 c 0.026,-0.033 0.053,-0.064 0.08,-0.098 l 35.085,18.518 0,2 C 1.407,-1.809 0.854,-0.734 0,0"/></g><g transform="translate(1.0117,6.3652)" id="g28"><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 34.988,12.635 0,6 L -0.097,0.117 C -0.064,0.078 -0.034,0.038 0,0"/></g><g transform="translate(9,29.0825)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.306,-5.156 1.328,-2.997 0.886,-5.344 2.525,-3.607 1.379,-5.704 3.475,-4.558 1.738,-6.197 4.085,-5.755 1.927,-6.777 7.083,-7.083 1.927,-7.388 4.085,-8.41 1.738,-7.969 3.475,-9.608 1.379,-8.462 2.525,-10.558 0.886,-8.821 1.328,-11.168 0.306,-9.01 0,-14.165 l -0.306,5.155 -1.022,-2.158 0.442,2.347 -1.639,-1.737 1.146,2.096 -2.096,-1.146 1.737,1.639 -2.347,-0.441 2.158,1.022 -5.156,0.305 5.156,0.306 -2.158,1.022 2.347,-0.442 -1.737,1.639 2.096,-1.146 -1.146,2.097 1.639,-1.737 -0.442,2.347 1.022,-2.159 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#003893" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#F4900C" d="M34.593 5.977L.835 29.42c.025.033.053.064.08.098L36 11V9c0-1.214-.553-2.289-1.407-3.023z"/><path fill="#EEE" d="M1.012 29.635L36 17v-6L.915 29.518c.032.039.063.079.097.117z"/><path fill="#FFF" d="M9 6.917l.306 5.156 1.022-2.158-.442 2.347 1.639-1.737-1.146 2.096 2.096-1.146-1.737 1.639 2.347-.442-2.158 1.023 5.156.305-5.156.306 2.158 1.022-2.347-.442 1.737 1.639-2.096-1.146 1.146 2.096-1.639-1.736.442 2.346-1.022-2.158L9 21.082l-.306-5.155-1.022 2.158.442-2.346-1.639 1.736 1.146-2.096-2.096 1.146 1.737-1.639-2.347.442 2.158-1.022L1.917 14l5.156-.305-2.158-1.023 2.347.442-1.737-1.639 2.096 1.146-1.146-2.096 1.639 1.737-.442-2.347 1.022 2.158z"/></svg> \ No newline at end of file |