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/1f4b2.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/1f4b2.svg')
-rw-r--r-- | public/emoji/1f4b2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4b2.svg b/public/emoji/1f4b2.svg index 12abc5323..1bc1ead4f 100644 --- a/public/emoji/1f4b2.svg +++ b/public/emoji/1f4b2.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(28.8096,12.791)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,7.672 -14.144,7.171 -14.144,11.803 0,2.242 2.145,3.338 4.633,3.338 4.184,0 4.929,-2.689 6.824,-2.689 1.342,0 1.989,0.845 1.989,1.792 0,2.201 -3.337,3.867 -6.537,4.445 l 0,2.123 c 0,1.325 -1.073,2.4 -2.399,2.4 -1.326,0 -2.4,-1.075 -2.4,-2.4 l 0,-2.199 c -3.489,-0.795 -6.49,-3.215 -6.49,-7.159 0,-7.369 14.142,-7.071 14.142,-12.248 0,-1.793 -1.941,-3.586 -5.129,-3.586 -4.781,0 -6.374,3.237 -8.316,3.237 -0.946,0 -1.792,-0.796 -1.792,-1.997 0,-1.906 3.195,-4.2 7.588,-4.84 0,-0.004 -0.003,-0.01 -0.003,-0.015 l 0,-2.398 c 0,-1.326 1.075,-2.401 2.401,-2.401 1.325,0 2.4,1.075 2.4,2.401 l 0,2.398 c 0,0.028 -0.014,0.05 -0.016,0.075 C -3.297,-7.182 0,-4.605 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M28.81 23.209c0-7.672-14.144-7.171-14.144-11.803 0-2.242 2.145-3.337 4.633-3.337 4.184 0 4.929 2.688 6.824 2.688 1.342 0 1.988-.845 1.988-1.792 0-2.201-3.337-3.867-6.537-4.444V2.397c0-1.325-1.072-2.4-2.398-2.4-1.327 0-2.4 1.075-2.4 2.4v2.199c-3.489.794-6.49 3.214-6.49 7.159 0 7.369 14.142 7.071 14.142 12.247 0 1.793-1.941 3.586-5.129 3.586-4.781 0-6.374-3.236-8.316-3.236-.946 0-1.792.796-1.792 1.996 0 1.906 3.195 4.2 7.588 4.841l-.003.015v2.397c0 1.326 1.075 2.401 2.401 2.401 1.325 0 2.399-1.075 2.399-2.401v-2.397c0-.028-.014-.05-.016-.075 3.953-.738 7.25-3.315 7.25-7.92z"/></svg> \ No newline at end of file |