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/264f.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/264f.svg')
-rw-r--r-- | public/emoji/264f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/264f.svg b/public/emoji/264f.svg index b8a7bf8d6..ec1b93ae4 100644 --- a/public/emoji/264f.svg +++ b/public/emoji/264f.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:#9266cc;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(31.5,8)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.5,4 0,-8 5.5,4 z"/></g><g transform="translate(27,9.5)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.842,0 -4,0.933 -4,4.5 l 0,11 c 0,3.979 -1.776,4.939 -3.268,5.291 -1.465,0.345 -2.971,-0.291 -4.024,-1.269 -0.595,0.751 -1.313,1.113 -1.976,1.269 -1.459,0.345 -2.959,-0.286 -4.011,-1.257 C -18.295,20.881 -19.607,21 -20,21 c -0.829,0 -1.5,-0.671 -1.5,-1.5 0,-0.829 0.671,-1.5 1.5,-1.5 0.155,0 1,-0.646 1,-3.5 l 0,-11 c 0,-0.828 0.671,-1.5 1.5,-1.5 0.829,0 1.5,0.672 1.5,1.5 0,0 0.006,12.81 0.006,13.086 0,0.83 0.672,1.502 1.502,1.502 0.829,0 1.502,-0.672 1.502,-1.502 C -12.99,16.371 -13,3.5 -13,3.5 -13,2.672 -12.329,2 -11.5,2 c 0.829,0 1.5,0.672 1.5,1.5 0,0 0.006,12.81 0.006,13.086 0,0.83 0.672,1.502 1.502,1.502 0.829,0 1.502,-0.672 1.502,-1.502 C -6.99,16.371 -7,4.5 -7,4.5 -7,0.548 -6.465,-3 0,-3 0.828,-3 1.5,-2.328 1.5,-1.5 1.5,-0.672 0.828,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" 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="M31.5 28L26 24v8z"/><path fill="#FFF" d="M27 26.5c-3.842 0-4-.933-4-4.5V11c0-3.979-1.776-4.939-3.268-5.291-1.465-.345-2.971.291-4.024 1.269-.595-.751-1.313-1.113-1.976-1.269-1.46-.345-2.959.286-4.012 1.257C8.705 5.619 7.393 5.5 7 5.5c-.829 0-1.5.671-1.5 1.5S6.171 8.5 7 8.5c.155 0 1 .646 1 3.5v11c0 .828.671 1.5 1.5 1.5S11 23.828 11 23l.006-13.086c0-.83.673-1.502 1.502-1.502.83 0 1.502.673 1.502 1.502L14 23c0 .828.671 1.5 1.5 1.5S17 23.828 17 23l.006-13.086c0-.83.673-1.502 1.502-1.502.83 0 1.502.673 1.502 1.502L20 22c0 3.952.535 7.5 7 7.5.828 0 1.5-.672 1.5-1.5s-.672-1.5-1.5-1.5z"/></svg> \ No newline at end of file |