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/1f4e1.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/1f4e1.svg')
-rw-r--r-- | public/emoji/1f4e1.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4e1.svg b/public/emoji/1f4e1.svg index e345be12d..dcb02946d 100644 --- a/public/emoji/1f4e1.svg +++ b/public/emoji/1f4e1.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(10.7456,14.4795)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.668,0 7.43,-4.345 7.427,-9.701 7.43,-15.06 -7.426,-15.06 -7.427,-9.7 -7.426,-4.345 -1.668,0 0,0"/></g><g transform="translate(8.5405,10.8184)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 8.839,-8.84 17.337,-5.163 20.033,-2.469 22.728,0.227 19.874,7.447 13.662,13.66 7.447,19.873 0.227,22.727 -2.468,20.032 -5.164,17.337 -8.84,8.838 0,0"/></g><g transform="translate(12.4434,14.7217)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 6.214,-6.214 13.434,-9.066 16.13,-6.372 18.825,-3.676 15.972,3.544 9.759,9.757 3.544,15.97 -3.676,18.824 -6.371,16.128 -9.066,13.434 -6.213,6.212 0,0"/></g><g transform="translate(22.2021,24.4785)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.443,-0.444 0.443,-1.163 0,-1.607 l -7.233,-7.231 c -0.444,-0.444 -1.163,-0.444 -1.607,0 -0.445,0.443 -0.445,1.163 0,1.607 L -1.608,0 C -1.163,0.445 -0.445,0.445 0,0"/></g><g transform="translate(23.8086,26.0854)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.887,-0.887 0.887,-2.327 0,-3.214 -0.888,-0.888 -2.327,-0.888 -3.215,0 -0.887,0.887 -0.887,2.327 0,3.214 0.888,0.888 2.327,0.888 3.215,0"/></g><g transform="translate(28.2871,22.9224)" id="g40"><path id="path42" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.017,0 -0.034,0.001 -0.051,0.001 -0.602,0.029 -1.027,0.499 -1,1.05 -0.999,1.066 -0.936,3.207 -2.58,4.85 -4.218,6.487 -6.352,6.429 -6.381,6.43 -6.931,6.397 -7.401,6.828 -7.43,7.378 -7.457,7.93 -7.032,8.4 -6.48,8.427 -6.358,8.439 -3.452,8.55 -1.166,6.264 1.121,3.977 1.004,1.073 0.998,0.95 0.971,0.416 0.529,0 0,0"/></g><g transform="translate(31.8457,23.478)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.109,0 -0.221,0.019 -0.33,0.057 -0.522,0.182 -0.796,0.753 -0.613,1.274 0.034,0.107 0.892,2.877 -2.196,5.964 -3.126,3.126 -6.126,2.414 -6.252,2.382 -0.529,-0.137 -1.077,0.184 -1.215,0.715 -0.14,0.531 0.171,1.074 0.701,1.217 0.17,0.046 4.205,1.078 8.18,-2.9 C 2.291,4.695 1.001,0.833 0.943,0.67 0.8,0.258 0.413,0 0,0"/></g><g transform="translate(10.9136,3.4795)" id="g48"><path id="path50" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.9,0 -5.543,0.658 -7.566,1.737 -7.574,1.591 -7.595,1.447 -7.595,1.3 -7.594,-4.06 7.262,-4.06 7.259,1.299 7.259,1.389 7.245,1.476 7.242,1.564 5.264,0.588 2.746,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M10.746 21.521c1.668 0 7.43 4.345 7.427 9.701.003 5.358-14.853 5.358-14.854-.001.001-5.356 5.759-9.7 7.427-9.7z"/><path fill="#CCD6DD" d="M8.541 25.182c8.839 8.84 17.337 5.163 20.033 2.469 2.695-2.696-.158-9.916-6.371-16.129C15.988 5.308 8.767 2.455 6.072 5.15 3.377 7.845-.299 16.343 8.541 25.182z"/><path fill="#66757F" d="M12.443 21.278c6.214 6.214 13.434 9.066 16.13 6.372 2.695-2.696-.158-9.916-6.371-16.129C15.988 5.308 8.767 2.455 6.072 5.15c-2.695 2.695.158 9.916 6.371 16.128z"/><path fill="#CCD6DD" d="M22.202 11.521c.443.444.443 1.163 0 1.607l-7.233 7.231c-.444.444-1.163.444-1.607 0-.444-.443-.444-1.163 0-1.607l7.232-7.231c.445-.444 1.163-.444 1.608 0z"/><path fill="#CCD6DD" d="M23.809 9.915c.887.887.887 2.327 0 3.214-.888.888-2.327.888-3.215 0-.887-.887-.887-2.327 0-3.214.887-.889 2.327-.889 3.215 0z"/><path fill="#FFAC33" d="M28.287 13.078l-.051-.001c-.552-.027-.976-.497-.949-1.048.001-.016.063-2.157-1.58-3.8-1.638-1.637-3.772-1.579-3.801-1.58-.55.033-1.021-.398-1.049-.948-.027-.552.397-1.022.949-1.049.122-.012 3.028-.123 5.314 2.163 2.287 2.288 2.17 5.191 2.164 5.314-.026.533-.468.949-.997.949z"/><path fill="#FFAC33" d="M31.846 12.522c-.109 0-.221-.019-.33-.057-.521-.183-.796-.753-.613-1.274.034-.107.893-2.876-2.195-5.963-3.126-3.127-6.126-2.414-6.252-2.382-.529.137-1.077-.184-1.216-.715-.14-.531.172-1.074.701-1.217.17-.046 4.205-1.077 8.181 2.901 4.016 4.014 2.726 7.876 2.668 8.039-.144.41-.531.668-.944.668z"/><path fill="#66757F" d="M10.914 32.521c-2.9 0-5.543-.658-7.566-1.737-.008.146-.029.29-.029.438.001 5.359 14.857 5.359 14.854.001 0-.09-.015-.177-.018-.266-1.977.976-4.496 1.564-7.241 1.564z"/></svg> \ No newline at end of file |