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/1f4ec.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/1f4ec.svg')
-rw-r--r-- | public/emoji/1f4ec.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4ec.svg b/public/emoji/1f4ec.svg index 0ebfec4c5..27d6ebe61 100644 --- a/public/emoji/1f4ec.svg +++ b/public/emoji/1f4ec.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(22,3)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -8,-2.209 -8,0 l 0,10 c 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(10,33)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.418,0 -8,-3.582 -8,-8 l 0,-12 16,0 0,12 C 8,-3.582 4.419,0 0,0"/></g><g transform="translate(20,17.2393)" id="g28"><path id="path30" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.236 -1.065,-2.239 -2.293,-2.239 l -15.414,0 C -18.936,-2.239 -20,-1.236 -20,0 l 0,10.521 c 0,1.237 1.064,2.24 2.293,2.24 l 15.414,0 C -1.065,12.761 0,11.758 0,10.521 L 0,0 Z"/></g><g transform="translate(6.6367,23.2041)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.538,-6.572 c 0.113,-0.376 0.316,-0.716 0.596,-0.984 l 6.729,6.764 C 1.003,-0.573 1.003,-0.219 0.787,0 0.568,0.219 0.217,0.219 0,0"/></g><g transform="translate(13.3638,23.2041)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.218,0.219 -0.569,0.219 -0.787,0 -0.217,-0.219 -0.217,-0.573 0,-0.792 l 6.728,-6.764 c 0.28,0.268 0.483,0.608 0.596,0.984 L 0,0 Z"/></g><g transform="translate(17.707,30)" id="g40"><path id="path42" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15.414,0 c -1.229,0 -2.293,-1.003 -2.293,-2.239 l 0,-1.419 8.073,-8.114 c 1.052,-1.061 2.768,-1.061 3.822,0 l 8.105,8.126 0,1.407 C 2.293,-1.003 1.228,0 0,0"/></g><g transform="translate(17.707,30)" id="g44"><path id="path46" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15.414,0 c -1.166,0 -2.172,-0.906 -2.273,-2.055 l 8.407,-8.396 c 0.869,-0.874 2.277,-0.84 3.145,0.035 l 8.41,8.346 C 2.182,-0.914 1.17,0 0,0"/></g><g transform="translate(26,33)" id="g48"><path id="path50" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c 4.419,0 8,-3.582 8,-8 l 0,-12 8,0 8,0 0,12 C 8,-3.582 4.418,0 0,0"/></g><g transform="translate(26,35)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 c -1.104,0 -2,-0.896 -2,-2 l 0,-2 0,-10 c 0,-1.104 0.896,-2 2,-2 1.105,0 2,0.896 2,2 l 0,8 2,0 c 1.105,0 2,0.896 2,2 l 0,2 C 2,-0.896 1.105,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M22 33c0 2.209-8 2.209-8 0V23c0-2.209 1.791-4 4-4s4 1.791 4 4v10z"/><path fill="#292F33" d="M10 3c-4.418 0-8 3.582-8 8v12h16V11c0-4.418-3.582-8-8-8z"/><path fill="#CCD6DD" d="M20 18.761C20 19.997 18.935 21 17.707 21H2.293C1.064 21 0 19.997 0 18.761V8.239C0 7.003 1.064 6 2.293 6h15.414C18.935 6 20 7.003 20 8.239v10.522z"/><path fill="#99AAB5" d="M20 8.239C20 7.003 18.935 6 17.707 6H2.293C1.064 6 0 7.003 0 8.239v1.419l4.879 4.904-4.78 4.806c.112.376.316.716.596.983l4.972-4.998 2.407 2.419c1.052 1.06 2.768 1.06 3.821 0l2.426-2.432 4.984 5.011c.28-.268.483-.608.596-.983l-4.792-4.818L20 9.646V8.239z"/><path fill="#E1E8ED" d="M17.707 6H2.293C1.127 6 .121 6.906.02 8.055l8.408 8.397c.869.874 2.277.84 3.145-.035l8.41-8.346C19.889 6.914 18.877 6 17.707 6z"/><path fill="#99AAB5" d="M26 3H10c4.418 0 8 3.582 8 8v12h16V11c0-4.418-3.582-8-8-8z"/><path fill="#DD2E44" d="M26 1h-4c-1.104 0-2 .896-2 2v12c0 1.104.896 2 2 2s2-.896 2-2V7h2c1.104 0 2-.896 2-2V3c0-1.104-.896-2-2-2z"/></svg> \ No newline at end of file |