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/1f4b3.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/1f4b3.svg')
-rw-r--r-- | public/emoji/1f4b3.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4b3.svg b/public/emoji/1f4b3.svg index 2a7941970..97641af46 100644 --- a/public/emoji/1f4b3.svg +++ b/public/emoji/1f4b3.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(4,31)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-18 c 0,-2.209 1.791,-4 4,-4 l 28,0 c 2.209,0 4,1.791 4,4 l 0,18 c 0,0 0,4 -4,4 L 0,0 Z"/></g><path id="path24" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,21 -36,0 0,5 36,0 0,-5 z"/><path id="path26" style="fill:#f4f7f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,11 -28,0 0,6 28,0 0,-6 z"/><g transform="translate(19,12)" id="g28"><path id="path30" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.703,0 -2.341,1.21 -2.469,1.801 -3.016,1.76 -3.549,1.498 -4.273,1.037 -5.039,0.551 -5.906,0 -7,0 c -1.197,0 -1.924,0.675 -2,2 -0.003,0.056 0.038,0.188 0.021,0.188 -1.858,0 -3.202,-1.761 -3.215,-1.78 C -12.389,0.142 -12.693,0 -13,0 c -0.206,-0.001 -0.413,0.062 -0.591,0.193 -0.446,0.328 -0.542,0.953 -0.215,1.399 C -13.729,1.697 -11.89,4 -9,4 c 1.937,0 2.048,-1.375 2.078,-1.888 0.002,-0.033 0.004,-0.071 0.006,-0.109 0.486,0.034 0.991,0.354 1.57,0.723 0.961,0.61 2.154,1.371 3.75,0.962 0.871,-0.223 1.007,-1.032 1.059,-1.336 0.013,-0.077 0.032,-0.191 0.049,-0.226 0.008,0 0.146,-0.091 0.577,-0.13 0.82,-0.075 1.722,0.279 2.675,0.653 0.988,0.388 2.01,0.789 3.111,0.789 3.389,0 4.767,-1.635 4.913,-1.822 C 11.128,1.182 11.051,0.553 10.616,0.213 10.442,0.076 10.236,0.006 10.03,0 9.723,-0.009 9.416,0.123 9.212,0.384 9.188,0.411 8.283,1.437 5.875,1.437 5.152,1.437 4.347,1.122 3.494,0.788 2.487,0.393 1.062,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M4 5C1.791 5 0 6.791 0 9v18c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V9s0-4-4-4H4z"/><path fill="#292F33" d="M0 10h36v5H0z"/><path fill="#F4F7F9" d="M4 19h28v6H4z"/><path fill="#8899A6" d="M19 24c-1.703 0-2.341-1.21-2.469-1.801-.547.041-1.08.303-1.805.764C13.961 23.449 13.094 24 12 24c-1.197 0-1.924-.675-2-2-.003-.056.038-.188.021-.188-1.858 0-3.202 1.761-3.215 1.779-.195.267-.499.409-.806.409-.206 0-.413-.063-.591-.194-.445-.327-.542-.953-.215-1.398C5.271 22.303 7.11 20 10 20c1.937 0 2.048 1.375 2.078 1.888l.007.109c.486-.034.991-.354 1.57-.723.961-.61 2.153-1.371 3.75-.962.871.223 1.007 1.031 1.059 1.336.013.076.032.19.049.226.007 0 .146.091.577.13.82.075 1.721-.279 2.675-.653.988-.388 2.01-.788 3.111-.788 3.389 0 4.767 1.635 4.913 1.821.34.435.264 1.063-.171 1.403-.175.137-.381.207-.587.213-.307.009-.613-.123-.817-.384-.024-.027-.93-1.054-3.337-1.054-.723 0-1.528.315-2.381.649-1.009.396-2.434.789-3.496.789z"/></svg> \ No newline at end of file |