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/1f6bb.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/1f6bb.svg')
-rw-r--r-- | public/emoji/1f6bb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6bb.svg b/public/emoji/1f6bb.svg index 851ec0cf0..0ecbb5355 100644 --- a/public/emoji/1f6bb.svg +++ b/public/emoji/1f6bb.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:#3b88c3;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(17.8384,17.7886)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.657,1.534 -2.699,5.82 -5.525,7.509 0.422,0.603 0.687,1.363 0.687,2.203 0,1.933 -1.344,3.5 -3.001,3.5 -1.657,0 -3,-1.567 -3,-3.5 0,-0.84 0.264,-1.6 0.687,-2.203 -2.827,-1.689 -4.868,-5.976 -5.525,-7.51 -0.435,-1.014 0.035,-2.189 1.049,-2.625 0.257,-0.11 0.525,-0.163 0.788,-0.163 0.775,0 1.513,0.454 1.839,1.211 0.053,0.122 0.108,0.242 0.163,0.364 l 0,-12.075 c 0,-0.828 0.671,-1.5 1.5,-1.5 0.828,0 1.5,0.672 1.5,1.5 l 0,7.5 c 0,0.553 0.447,1 1,1 0.552,0 1,-0.447 1,-1 l 0,-0.858 0,-0.142 0,-6.5 c 0,-0.828 0.672,-1.5 1.5,-1.5 0.828,0 1.5,0.672 1.5,1.5 l 0,12.073 c 0.054,-0.121 0.109,-0.24 0.162,-0.362 0.437,-1.013 1.612,-1.483 2.627,-1.048 C -0.035,-2.189 0.435,-1.015 0,0"/></g><g transform="translate(30.9961,15.875)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.297,-0.346 0.717,-0.523 1.14,-0.523 0.344,0 0.692,0.119 0.975,0.361 0.629,0.539 0.701,1.486 0.162,2.115 l -5.73,6.685 c 0.869,0.613 1.457,1.716 1.457,2.987 0,1.934 -1.344,3.5 -3,3.5 -1.657,0 -3,-1.566 -3,-3.5 0,-1.35 0.662,-2.507 1.621,-3.091 l -5.739,-6.408 c -0.552,-0.617 -0.5,-1.566 0.117,-2.118 0.618,-0.553 1.567,-0.499 2.118,0.117 l 1.883,2 0,-2 -4,-6 3,0 0,-5.5 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,5.5 2,0 0,-5.5 c 0,-0.828 0.672,-1.5 1.5,-1.5 0.828,0 1.5,0.672 1.5,1.5 l 0,5.5 3,0 -4,6 0,2 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" 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="M17.838 18.211c-.657-1.534-2.699-5.82-5.525-7.509C12.736 10.1 13 9.339 13 8.5 13 6.566 11.656 5 10 5 8.343 5 7 6.566 7 8.5c0 .84.264 1.6.687 2.203-2.826 1.689-4.868 5.976-5.525 7.51-.435 1.014.035 2.189 1.049 2.625.257.109.524.162.788.162.775 0 1.513-.454 1.839-1.211.052-.122.107-.242.162-.363V31.5c0 .828.671 1.5 1.5 1.5S9 32.328 9 31.5V24c0-.553.448-1 1-1s1 .447 1 1v7.5c0 .828.672 1.5 1.5 1.5s1.5-.672 1.5-1.5V19.428c.055.12.109.239.162.361.437 1.014 1.612 1.483 2.627 1.048 1.014-.437 1.484-1.61 1.049-2.626zm13.158 1.914c.297.346.717.523 1.14.523.345 0 .692-.119.976-.361.629-.539.701-1.486.162-2.115l-5.73-6.686C28.412 10.874 29 9.771 29 8.5 29 6.566 27.656 5 26 5c-1.657 0-3 1.567-3 3.5 0 1.35.662 2.507 1.621 3.091l-5.739 6.408c-.552.617-.5 1.566.117 2.118.618.553 1.567.499 2.118-.117L23 18v2l-4 6h3v5.5c0 .828.671 1.5 1.5 1.5s1.5-.672 1.5-1.5V26h2v5.5c0 .828.672 1.5 1.5 1.5s1.5-.672 1.5-1.5V26h3l-4-6v-2l1.996 2.125z"/></svg> \ No newline at end of file |