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/1f3ef.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/1f3ef.svg')
-rw-r--r-- | public/emoji/1f3ef.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3ef.svg b/public/emoji/1f3ef.svg index 19127e6ff..21683997e 100644 --- a/public/emoji/1f3ef.svg +++ b/public/emoji/1f3ef.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"><path id="path12" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 31,13 5,13 5,6 31,6 31,13 Z"/><g transform="translate(3.9996,7.0002)" id="g14"><path id="path16" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,-7 32,-7 28.001,0 0,0 Z"/></g><g transform="translate(30,16)" id="g18"><path id="path20" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -24,0 -29,-4 5,-4 0,0 Z"/></g><g transform="translate(18,26.1182)" id="g22"><path id="path24" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8.236,-4.118 16.472,0 L 0,0 Z"/></g><g transform="translate(18,26.1182)" id="g26"><path id="path28" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 8.236,-4.118 -16.472,0 L 0,0 Z m 12,-4.118 -1,5 -22,0 -1,-5 -4,-3 32,0 -4,3 z"/></g><path id="path30" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,19 -24,0 0,-3 24,0 0,3 z"/><g transform="translate(24,27)" id="g32"><path id="path34" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,4 -12,0 0,-4 -2,0 0,-2 16,0 0,2 -2,0 z"/></g><g transform="translate(12,34)" id="g36"><path id="path38" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 12,0 0,-2 2,-2 -16,0 2,2 0,2 z"/></g><g transform="translate(23.0004,36)" id="g40"><path id="path42" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-1 -10.001,0 0,1 -1,0 0,-1 0,-1 1,0 L 0,-2 1,-2 1,-1 1,0 0,0 Z"/></g><g transform="translate(12,22)" id="g44"><path id="path46" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 6,3 12,0 0,0 Z m 18,-0.764 -5.105,2.553 -6,3 L 6,5.236 5.105,4.789 l -6,-3 L -6,-0.764 -6,-2 l 6,0 12,0 6,0 0,1.236 z"/></g><path id="path48" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 31,7 5,7 5,9 31,9 31,7 Z"/></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D1D3D4" d="M5 23h26v7H5z"/><path fill="#D99E82" d="M0 36h36l-4-7H4z"/><path fill="#66757F" d="M30 20H6l-5 4h34z"/><path fill="#D1D3D4" d="M18 9.882L9.764 14h16.472z"/><path fill="#66757F" d="M30 14l-1-5H7l-1 5-4 3h32l-4-3zM18 9.882L26.236 14H9.764L18 9.882z"/><path fill="#D1D3D4" d="M6 17h24v3H6zm18-8V5H12v4h-2v2h16V9z"/><path fill="#66757F" d="M12 2h12v2l2 2H10l2-2z"/><path fill="#99AAB5" d="M23 0v1H13V0h-1v2h12V0z"/><path fill="#66757F" d="M30 14.764l-5.105-2.553-6-3L18 8.764l-.895.447-6 3L6 14.764V16h24v-1.236zM12 14l6-3 6 3H12z"/><path fill="#6D6E71" d="M5 27h26v2H5z"/></svg> \ No newline at end of file |