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/1f4aa-1f3fb.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/1f4aa-1f3fb.svg')
| -rw-r--r-- | public/emoji/1f4aa-1f3fb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4aa-1f3fb.svg b/public/emoji/1f4aa-1f3fb.svg index 978179689..63f868316 100644 --- a/public/emoji/1f4aa-1f3fb.svg +++ b/public/emoji/1f4aa-1f3fb.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(12.4302,14)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.717,3.641 0.298,10.874 1.698,10.419 3.112,10 3.57,10 c 0.999,0 4,1 4,2 0,1 -1,2 -1,2 l 2,1 c 1,1 0,7 -4,7 -7,0 -9.57,-7 -9.57,-7 l 0.007,-0.011 -0.007,0 c 0,0 -6,-10.989 -6,-20 0.065,0 -1,-5 0,-6 1,-1 5,-1 5,-1 C 4,-16 22.57,-13 22.57,-4 22.57,9 3,6 0,0"/></g><g transform="translate(19.4941,3.748)" id="g24"><path id="path26" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.178,0 -5.793,1.283 -5.941,1.357 -0.493,0.247 -0.693,0.846 -0.448,1.34 0.246,0.494 0.845,0.696 1.341,0.45 0.042,-0.02 4.24,-2.06 7.956,-0.64 2.055,0.785 3.625,2.507 4.669,5.116 0.205,0.515 0.791,0.763 1.3,0.558 C 9.39,7.976 9.64,7.394 9.435,6.881 8.172,3.726 6.212,1.623 3.608,0.633 2.393,0.171 1.158,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M12.43 22s-.717-3.641.298-10.873c1.4.454 2.814.873 3.272.873 1 0 4-1 4-2s-1-2-1-2l2-1c1-1 0-7-4-7-7 0-9.57 7-9.57 7l.007.011H7.43s-6 10.989-6 20c.065 0-1 5 0 6s5 1 5 1C16.43 38 35 35 35 26c0-13-19.57-10-22.57-4z"/><path fill="#E0AA94" d="M19.494 32.252c-3.178 0-5.793-1.283-5.941-1.357-.493-.247-.693-.846-.447-1.34.246-.494.845-.695 1.34-.45.042.021 4.241 2.061 7.957.641 2.055-.785 3.625-2.507 4.669-5.116.205-.515.791-.763 1.3-.558.513.205.763.787.558 1.3-1.263 3.155-3.223 5.258-5.827 6.248-1.216.461-2.451.632-3.609.632z"/></svg> \ No newline at end of file |
