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/1f306.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/1f306.svg')
-rw-r--r-- | public/emoji/1f306.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f306.svg b/public/emoji/1f306.svg index 49a62d499..9e7ae826e 100644 --- a/public/emoji/1f306.svg +++ b/public/emoji/1f306.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 4,36 C 1.791,36 0,34.209 0,32 L 0,32 0,4 C 0,1.791 1.791,0 4,0 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,28 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 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"><path id="path20" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 37,-1 -38,0 0,38 38,0 0,-38 z"/><g transform="translate(10,0)" id="g22"><path id="path24" style="fill:#485359;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,29 4,4 2,0 4,-4 L 10,0 0,0 Z"/></g><g transform="translate(33,25)" id="g26"><path id="path28" style="fill:#485359;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1 -1,1 -1,1 l -7,0 c 0,0 -1,0 -1,-1 l 0,-25 9,0 0,25 z"/></g><g transform="translate(28,19)" id="g30"><path id="path32" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1 -1,1 -1,1 l -8,0 c -1,0 -1,-1 -1,-1 l 0,-19 10,0 0,19 z"/></g><g transform="translate(6,22)" id="g34"><path id="path36" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,1 -1,1 l -5,0 0,-23 6,0 0,22 z"/></g><g transform="translate(12,16)" id="g38"><path id="path40" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,1 -1,1 l -6,0 c 0,0 -1,10e-4 -1,-1 l 0,-16 8,0 0,16 z"/></g><g transform="translate(31,10)" id="g42"><path id="path44" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,1 1,1 L 5,1 5,-10 0,-10 0,0 Z"/></g><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,5 8,5 8,7 10,7 10,5 Z"/><path id="path48" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,13 -2,0 0,2 2,0 0,-2 z"/><path id="path50" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 8,9 6,9 6,11 8,11 8,9 Z"/><path id="path52" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,25 -2,0 0,2 2,0 0,-2 z"/><path id="path54" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,21 -2,0 0,2 2,0 0,-2 z"/><path id="path56" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,17 -2,0 0,2 2,0 0,-2 z"/><path id="path58" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,16 -2,0 0,2 2,0 0,-2 z"/><path id="path60" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24,12 -2,0 0,2 2,0 0,-2 z"/><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,6 -2,0 0,2 2,0 0,-2 z"/><path id="path64" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31,22 -2,0 0,2 2,0 0,-2 z"/><path id="path66" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31,18 -2,0 0,2 2,0 0,-2 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M32 0H4C1.791 0 0 1.791 0 4v22h36V4c0-2.209-1.791-4-4-4z"/><path fill="#485359" d="M10 36V7l4-4h2l4 4v29zm23-25c0-1-1-1-1-1h-7s-1 0-1 1v25h9V11z"/><path fill="#292F33" d="M28 17c0-1-1-1-1-1h-8c-1 0-1 1-1 1v19h10V17zm-17 2H6v-5s0-1-1-1H0v19c0 2.209 1.791 4 4 4h8V20s0-1-1-1zm21 6c-1 0-1 1-1 1v10h1c2.209 0 4-1.791 4-4v-7h-4z"/><path d="M8 29h2v2H8zm0-8h2v2H8zm-2 4h2v2H6zM16 9h2v2h-2zm0 4h2v2h-2zm-2 4h2v2h-2zm10 1h2v2h-2zm-2 4h2v2h-2zm-2 6h2v2h-2zm9-16h2v2h-2zm0 4h2v2h-2z" fill="#FFCC4D"/></svg> \ No newline at end of file |