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/1f4a5.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/1f4a5.svg')
-rw-r--r-- | public/emoji/1f4a5.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4a5.svg b/public/emoji/1f4a5.svg index f7d71d3ea..36c50d63b 100644 --- a/public/emoji/1f4a5.svg +++ b/public/emoji/1f4a5.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"/><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g transform="translate(21.9996,36)" id="g12"><path id="path14" style="fill:#bb1a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,-8.028 -5,5.018 0,-7.025 -10,2.007 8,-8.028 -11,-6.02 12,0 -5.999,-12.042 L -4,-26.09 6.863,-36 l 0.11,0 -2.972,13.924 9.999,0 -8,6.02 8,9.031 L 2.001,-10.035 0,0 Z"/></g><g transform="translate(22.9141,23.0762)" id="g16"><path id="path18" style="fill:#fcab40;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.86,0.467 7.086,1.778 3.705,-2.038 2.386,-3.528 3.975,-4.723 6.9,-6.925 l -3.656,0 -2.261,0 0.473,-2.219 1.551,-7.259 -5.845,5.332 -1.057,0.964 -1.187,-0.795 -5.24,-3.506 2.405,4.828 1.323,2.655 -2.958,0 -3.799,0 3.76,2.059 2.145,1.172 -1.727,1.734 -3.044,3.054 3.221,-0.646 2.186,-0.439 0,2.238 0,1.991 1.45,-1.455 1.794,-1.8 1.133,2.277 1.273,2.556"/></g><g transform="translate(21.5117,21.6992)" id="g20"><path id="path22" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.768,0.192 2.925,0.733 1.529,-0.842 0.984,-1.457 1.641,-1.95 l 1.208,-0.909 -1.51,0 -0.934,0 0.196,-0.916 0.64,-2.997 -2.413,2.201 -0.436,0.398 -0.491,-0.328 -2.163,-1.448 0.993,1.993 0.546,1.097 -1.22,0 -1.569,0 1.553,0.849 0.885,0.485 -0.713,0.716 -1.256,1.261 1.328,-0.267 0.903,-0.182 0,0.924 0,0.822 0.599,-0.6 0.74,-0.743 0.468,0.939 0.525,1.055"/></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#BB1A34" d="M22 0l-4 8.028-5-5.018v7.024L3 8.028l8 8.028-11 6.02h12L6 34.118l12-8.028 11 10.035-3-14.049h10l-8-6.021 8-9.031-12 3.01L22 0z"/><path fill="#FCAB40" d="M22.914 12.924l1.86-.467L30 11.146l-3.381 3.816-1.319 1.49 1.59 1.195 2.925 2.202h-5.918l.473 2.218 1.551 7.26-5.845-5.332-1.056-.964-1.188.795-5.24 3.506 2.406-4.828 1.322-2.655H9.564l3.759-2.059 2.145-1.172-1.727-1.735-3.044-3.053 3.221.646 2.186.439V8.686l1.45 1.455 1.794 1.799 1.133-2.276 1.273-2.556"/><path fill="#F5F8FA" d="M21.512 14.301l.767-.193 2.158-.541-1.396 1.576-.545.615.656.493 1.208.909h-2.443l.195.916.641 2.997-2.413-2.201-.437-.398-.49.328-2.163 1.448.993-1.994.546-1.096H16l1.553-.85.885-.484-.713-.716-1.257-1.261 1.329.267.903.181v-1.745l.599.6.74.743.468-.939.525-1.056"/></svg> \ No newline at end of file |