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/1f3d1.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/1f3d1.svg')
| -rw-r--r-- | public/emoji/1f3d1.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3d1.svg b/public/emoji/1f3d1.svg index 3cd95b299..c367cef2d 100644 --- a/public/emoji/1f3d1.svg +++ b/public/emoji/1f3d1.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(4,15)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.409,0 2,-2 2,-3 0,-1 0,-3 2,-3 2,0 3.464,2.465 7,6 l 21,21 0,-7 C 32,14 18.5,-0.5 14,-5 9.5,-9.5 7,-12 4,-12 c -3.513,0 -7,2.605 -7,7 0,4 2,5 3,5"/></g><g transform="translate(33,6.5)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.59 -2.91,-6.5 -6.5,-6.5 -3.59,0 -6.5,2.91 -6.5,6.5 0,3.59 2.91,6.5 6.5,6.5 C -2.91,6.5 0,3.59 0,0"/></g><g transform="translate(25.0098,17.2881)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.244,5.54 10.99,11.712 10.99,11.712 l 0,7 C 8.913,16.635 4.41,12.132 0,7.722 L 0,0 Z"/></g><g transform="translate(22,14.1221)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.325,0.341 0.66,0.692 1,1.049 L 1,8.878 0,7.878 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M4 21c2.409 0 2 2 2 3s0 3 2 3 3.464-2.465 7-6L36 0v7S22.5 21.5 18 26s-7 7-10 7c-3.513 0-7-2.605-7-7 0-4 2-5 3-5z"/><circle fill="#DD2E44" cx="26.5" cy="29.5" r="6.5"/><path fill="#FFAC33" d="M25.01 18.712C30.254 13.171 36 7 36 7V0L25.01 10.99v7.722zM22 21.878l1-1.049V13l-1 1v7.878z"/></svg> \ No newline at end of file |
