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/1f3f4.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/1f3f4.svg')
-rw-r--r-- | public/emoji/1f3f4.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3f4.svg b/public/emoji/1f3f4.svg index 82a6942b3..a5cc70d4a 100644 --- a/public/emoji/1f3f4.svg +++ b/public/emoji/1f3f4.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(5,0)" id="g20"><path id="path22" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.104,0 -2,0.896 -2,2 l 0,31 c 0,1.104 0.896,2 2,2 1.104,0 2,-0.896 2,-2 L 2,2 C 2,0.896 1.104,0 0,0"/></g><g transform="translate(5,35)" id="g24"><path id="path26" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.105,0 -2,-0.895 -2,-2 l 0,-31 c 0,-0.276 0.224,-0.5 0.5,-0.5 0.276,0 0.5,0.224 0.5,0.5 l 0,29.586 C -1,-2.633 -0.367,-2 0.414,-2 L 2,-2 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(5,0)" id="g28"><path id="path30" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.104,0 -2,0.896 -2,2 l 0,31 c 0,1.104 0.896,2 2,2 1.104,0 2,-0.896 2,-2 L 2,2 C 2,0.896 1.104,0 0,0"/></g><g transform="translate(5,35)" id="g32"><path id="path34" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.105,0 -2,-0.895 -2,-2 l 0,-31 c 0,-0.276 0.224,-0.5 0.5,-0.5 0.276,0 0.5,0.224 0.5,0.5 l 0,29.586 C -1,-2.633 -0.367,-2 0.414,-2 L 2,-2 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(32.415,32.9097)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.752,0.799 -3.615,1.187 -5.698,1.187 -2.518,0 -5.02,-0.57 -7.439,-1.122 -2.418,-0.551 -4.702,-1.071 -6.995,-1.071 -1.79,0 -3.382,0.329 -4.868,1.006 -0.309,0.142 -0.67,0.115 -0.956,-0.068 -0.286,-0.184 -0.459,-0.501 -0.459,-0.842 l 0,-19 c 0,-0.391 0.228,-0.747 0.585,-0.91 1.752,-0.799 3.616,-1.186 5.698,-1.186 2.518,0 5.02,0.57 7.439,1.122 2.418,0.551 4.702,1.071 6.995,1.071 1.79,0 3.383,-0.329 4.868,-1.007 0.31,-0.139 0.67,-0.115 0.956,0.07 0.286,0.183 0.459,0.5 0.459,0.84 l 0,19 C 0.585,-0.518 0.356,-0.162 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M5 36c-1.104 0-2-.896-2-2V3c0-1.104.896-2 2-2s2 .896 2 2v31c0 1.104-.896 2-2 2z"/><path fill="#AAB8C2" d="M5 1c-1.105 0-2 .895-2 2v31c0 .276.224.5.5.5s.5-.224.5-.5V4.414C4 3.633 4.633 3 5.414 3H7c0-1.105-.895-2-2-2z"/><path fill="#8899A6" d="M5 36c-1.104 0-2-.896-2-2V3c0-1.104.896-2 2-2s2 .896 2 2v31c0 1.104-.896 2-2 2z"/><path fill="#AAB8C2" d="M5 1c-1.105 0-2 .895-2 2v31c0 .276.224.5.5.5s.5-.224.5-.5V4.414C4 3.633 4.633 3 5.414 3H7c0-1.105-.895-2-2-2z"/><path fill="#292F33" d="M32.415 3.09c-1.752-.799-3.615-1.187-5.698-1.187-2.518 0-5.02.57-7.438 1.122-2.418.551-4.702 1.072-6.995 1.072-1.79 0-3.382-.329-4.868-1.006-.309-.142-.67-.115-.956.068C6.173 3.343 6 3.66 6 4v19c0 .392.229.747.585.91 1.752.799 3.616 1.187 5.698 1.187 2.518 0 5.02-.57 7.438-1.122 2.418-.551 4.702-1.071 6.995-1.071 1.79 0 3.383.329 4.868 1.007.311.14.67.115.956-.069.287-.185.46-.502.46-.842V4c0-.392-.229-.748-.585-.91z"/></svg> \ No newline at end of file |