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/264d.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/264d.svg')
-rw-r--r-- | public/emoji/264d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/264d.svg b/public/emoji/264d.svg index 74919add4..98ad1a87e 100644 --- a/public/emoji/264d.svg +++ b/public/emoji/264d.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(25.877,13.4893)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.377,-1.216 -1.374,-2.325 -2.587,-3.276 -0.463,1.466 -0.657,2.944 -0.28,4.164 0.729,2.354 1.986,3.609 2.882,4.239 C 0.401,4.098 0.729,2.353 0,0 M 2.865,-0.887 C 4.561,4.593 1.913,7.937 1.8,8.077 L 1.169,8.853 0.21,8.569 C 0.108,8.539 -1.35,8.079 -2.877,6.59 l 0,4.921 c 0,3.979 -1.776,4.939 -3.268,5.291 -1.465,0.344 -2.971,-0.292 -4.024,-1.269 -0.595,0.751 -1.313,1.112 -1.976,1.269 -1.459,0.344 -2.959,-0.286 -4.011,-1.258 -1.016,1.348 -2.328,1.467 -2.721,1.467 -0.829,0 -1.5,-0.672 -1.5,-1.5 0,-0.829 0.671,-1.5 1.5,-1.5 0.135,0 0.832,-0.492 1,-2.5 l 0,-12 c 0,-0.828 0.671,-1.5 1.5,-1.5 0.829,0 1.5,0.672 1.5,1.5 l 0,13.086 c 0,0.829 0.67,1.502 1.5,1.502 0.83,0 1.5,-0.673 1.5,-1.502 l 0,-13.086 c 0,-0.828 0.671,-1.5 1.5,-1.5 0.829,0 1.5,0.672 1.5,1.5 l 0,13.086 c 0,0.829 0.67,1.502 1.5,1.502 0.83,0 1.5,-0.673 1.5,-1.502 l 0,-11.416 c -0.427,-1.99 -0.011,-4.162 0.704,-6.127 -1.385,-0.751 -2.712,-1.29 -3.511,-1.557 -0.786,-0.263 -1.211,-1.111 -0.95,-1.897 0.261,-0.786 1.109,-1.21 1.896,-0.951 0.154,0.052 1.811,0.612 3.788,1.662 1.038,-1.983 2.089,-3.381 2.188,-3.511 0.295,-0.388 0.742,-0.592 1.195,-0.592 0.316,0 0.635,0.1 0.907,0.307 0.659,0.501 0.787,1.442 0.285,2.101 -0.51,0.671 -1.301,1.863 -2.021,3.266 1.873,1.34 3.598,3.087 4.261,5.231"/></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="M28.742 23.398c1.696-5.48-.952-8.824-1.065-8.964l-.631-.776-.959.284c-.102.03-1.56.49-3.087 1.979V11c0-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.135 0 .832.492 1 2.5v12c0 .828.671 1.5 1.5 1.5S11 23.828 11 23V9.914c0-.83.67-1.502 1.5-1.502s1.5.672 1.5 1.502V23c0 .828.671 1.5 1.5 1.5S17 23.828 17 23V9.914c0-.83.67-1.502 1.5-1.502s1.5.672 1.5 1.502v11.415c-.427 1.99-.011 4.162.704 6.127-1.385.751-2.712 1.29-3.511 1.557-.786.263-1.212 1.111-.95 1.897.261.786 1.108 1.211 1.895.951.154-.052 1.812-.611 3.788-1.662 1.038 1.983 2.089 3.382 2.188 3.512.295.388.742.592 1.194.592.316 0 .636-.1.907-.307.659-.501.787-1.442.285-2.102-.51-.671-1.301-1.863-2.021-3.266 1.875-1.339 3.6-3.086 4.263-5.23zm-2.865-.887c-.377 1.216-1.374 2.325-2.587 3.276-.463-1.467-.657-2.944-.28-4.164.729-2.354 1.986-3.61 2.882-4.239.386 1.029.714 2.773-.015 5.127z"/></svg> \ No newline at end of file |