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/1f3bd.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/1f3bd.svg')
-rw-r--r-- | public/emoji/1f3bd.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3bd.svg b/public/emoji/1f3bd.svg index 5afc205fc..8410aee4e 100644 --- a/public/emoji/1f3bd.svg +++ b/public/emoji/1f3bd.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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 28.719,34.396 C 27.68,29.08 21.843,24.493 17.999,24.493 l 0,0 c -3.832,0 -9.635,4.563 -10.696,9.86 l 0,0 c -0.109,0.552 -1.214,1.458 -2.001,1.06 l 0,0 C 3.472,34.484 1.105,32.561 1.105,30.055 l 0,0 C 4.227,25.447 4.932,23.674 4.932,18.896 l 0,0 C 4.932,14.118 3.566,4.778 2.372,2.389 l 0,0 C 3.566,1.193 10.594,0 17.999,0 l 0,0 c 7.405,0 14.449,1.193 15.643,2.389 l 0,0 c -1.194,2.389 -2.546,11.729 -2.546,16.507 l 0,0 c 0,4.778 0.701,6.551 3.822,11.159 l 0,0 c 0,2.536 -2.429,4.474 -4.269,5.39 l 0,0 c -0.127,0.063 -0.263,0.091 -0.401,0.091 l 0,0 c -0.689,0 -1.441,-0.692 -1.529,-1.14"/></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(6.3184,34.9692)" id="g20"><path id="path22" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.499,-1.499 13.184,-8.685 23.386,0 1.299,-1.19 1.474,-6.039 -0.73,-7.626 -2.203,-1.587 -10.137,-9.608 -16,-6.083 -5.862,3.526 -7.096,5.863 -7.317,8.464 C -0.881,-2.646 0,0 0,0"/></g><g transform="translate(34.918,30.0542)" id="g24"><path id="path26" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2.537 -2.429,4.475 -4.27,5.391 -0.76,0.378 -1.812,-0.393 -1.896,-0.873 -0.943,-5.39 -6.867,-10.08 -10.753,-10.08 -3.832,0 -9.635,4.563 -10.696,9.861 -0.11,0.551 -1.183,1.467 -1.947,1.085 C -31.4,4.466 -33.813,2.531 -33.813,0 c 3.122,-4.607 3.827,-6.381 3.827,-11.159 0,-4.777 -1.366,-14.117 -2.56,-16.506 1.194,-1.196 8.222,-2.389 15.627,-2.389 7.405,0 14.448,1.193 15.643,2.389 -1.195,2.389 -2.546,11.729 -2.546,16.506 0,4.778 0.701,6.552 3.822,11.159"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(34.8809,29.6357)" id="g36"><path id="path38" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -32.133,-20.157 -33.279,-27.255 0.441,-6.392 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#269" d="M6.318 1.031c1.499 1.499 13.184 8.685 23.386 0V12H6.318V1.031z"/><path fill="#55ACEE" d="M34.918 5.946c0-2.537-2.429-4.475-4.27-5.391-.761-.378-1.812.393-1.896.873-.943 5.39-6.867 10.08-10.753 10.08-3.833 0-9.636-4.563-10.696-9.861C7.193 1.096 6.12.18 5.356.562c-1.838.917-4.251 2.853-4.251 5.384 3.122 4.607 3.827 6.381 3.827 11.159 0 4.777-1.366 14.117-2.56 16.507C3.566 34.807 10.594 36 18 36c7.405 0 14.448-1.193 15.642-2.389-1.194-2.39-2.546-11.73-2.546-16.507 0-4.777.701-6.551 3.822-11.158z"/><path fill="#FFD983" d="M4.192 25.616c-.433 3.006-1.002 5.832-1.56 7.366l28.506-17.637c.177-3.329.976-5.184 3.323-8.717L4.192 25.616z"/></svg> \ No newline at end of file |