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/1f4bd.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/1f4bd.svg')
-rw-r--r-- | public/emoji/1f4bd.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4bd.svg b/public/emoji/1f4bd.svg index e02677fee..a557b9bf2 100644 --- a/public/emoji/1f4bd.svg +++ b/public/emoji/1f4bd.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 3.777,18 C 3.777,10.147 10.145,3.777 18,3.777 l 0,0 c 7.853,0 14.223,6.37 14.223,14.223 l 0,0 c 0,7.855 -6.37,14.223 -14.223,14.223 l 0,0 C 10.145,32.223 3.777,25.855 3.777,18 m 9.988,0 c 0,2.34 1.895,4.235 4.235,4.235 l 0,0 c 2.338,0 4.236,-1.895 4.236,-4.235 l 0,0 c 0,-2.338 -1.898,-4.236 -4.236,-4.236 l 0,0 c -2.34,0 -4.235,1.898 -4.235,4.236"/></clipPath><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" 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:#292f33;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(18,20.667)" id="g24"><path id="path26" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.473,0 -2.667,-1.194 -2.667,-2.667 0,-1.474 1.194,-2.666 2.667,-2.666 1.474,0 2.666,1.192 2.666,2.666 C 2.666,-1.194 1.474,0 0,0 m 16,-2.667 c 0,-8.836 -7.164,-16 -16,-16 -8.836,0 -16,7.164 -16,16 0,8.836 7.164,16 16,16 8.836,0 16,-7.164 16,-16"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(18,18)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -16,1.777 -16,16 -1.777,16 0,0 Z"/></g><g transform="translate(18,18)" id="g40"><path id="path42" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 16,-1.777 16,-16 1.777,-16 0,0 Z"/></g><g transform="translate(18.0005,17.9995)" id="g44"><path id="path46" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.888,-16.888 15.999,-15.999 0,0 Z"/></g><g transform="translate(18.0005,17.9995)" id="g48"><path id="path50" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -16.001,16.001 -1.778,16.889 0,0 Z"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(36,15)" id="g60"><path id="path62" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -11,0 c -1.104,0 -2,0.896 -2,2 l 0,6 c 0,1.105 0.896,2 2,2 L -2,8 C -0.895,8 0,7.105 0,6 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" 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="#FFD983" d="M34 18c0 8.837-7.163 16-16 16-8.836 0-16-7.163-16-16C2 9.164 9.164 2 18 2c8.837 0 16 7.164 16 16zm-16-2.667c-1.473 0-2.667 1.194-2.667 2.667 0 1.473 1.194 2.667 2.667 2.667 1.473 0 2.667-1.194 2.667-2.667 0-1.473-1.194-2.667-2.667-2.667z"/><path fill="#FFAC33" d="M13.811 17.535c.109-.982.531-1.868 1.193-2.53L7.943 7.943c-2.226 2.226-3.712 5.187-4.075 8.487l9.943 1.105zm8.378.93c-.109.981-.532 1.867-1.194 2.53l7.062 7.062c2.226-2.226 3.712-5.187 4.075-8.487l-9.943-1.105z"/><path fill="#FFE8B6" d="M18.469 22.189l1.111 9.941c3.295-.365 6.253-1.85 8.476-4.074l-7.062-7.062c-.661.662-1.546 1.086-2.525 1.195zm-.91-8.38l-1.048-9.953c-3.333.347-6.324 1.843-8.569 4.087l7.062 7.062c.668-.668 1.564-1.092 2.555-1.196z"/><path fill="#F5F8FA" d="M36 21c0 1.104-.896 2-2 2H23c-1.104 0-2-.896-2-2v-6c0-1.104.896-2 2-2h11c1.104 0 2 .896 2 2v6z"/></svg> \ No newline at end of file |