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/1f6e1.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/1f6e1.svg')
| -rw-r--r-- | public/emoji/1f6e1.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6e1.svg b/public/emoji/1f6e1.svg index 1f0c881fb..97f68942e 100644 --- a/public/emoji/1f6e1.svg +++ b/public/emoji/1f6e1.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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 4.76,31.556 C 1.961,16.169 6.412,6.27 18,2.116 l 0,0 c 11.587,4.154 16.039,14.053 13.24,29.44 l 0,0 C 24.958,33.961 18.071,34 18,34 l 0,0 C 17.928,34 11.063,33.971 4.76,31.556"/></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(33,33)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7,3 -15,3 -15,3 0,0 -8,0 -15,-3 -3,-15 0,-28 15,-33 15,5 18,18 15,33"/></g><g transform="translate(18,2.1162)" id="g24"><path id="path26" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -11.588,4.154 -16.039,14.053 -13.24,29.439 6.303,2.415 13.168,2.445 13.24,2.445 0.071,0 6.958,-0.04 13.24,-2.445 C 16.039,14.053 11.588,4.154 0,0"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><path id="path36" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 33,2 18,2 18,34 33,34 33,2 Z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M33 3c-7-3-15-3-15-3S10 0 3 3C0 18 3 31 18 36c15-5 18-18 15-33z"/><path fill="#55ACEE" d="M18 33.884C6.412 29.729 1.961 19.831 4.76 4.444 11.063 2.029 17.928 2 18 2c.071 0 6.958.04 13.24 2.444 2.799 15.387-1.652 25.285-13.24 29.44z"/><path fill="#269" d="M31.24 4.444C24.958 2.04 18.071 2 18 2v31.884c11.588-4.155 16.039-14.053 13.24-29.44z"/></svg> \ No newline at end of file |
