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/1f52f.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/1f52f.svg')
-rw-r--r-- | public/emoji/1f52f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f52f.svg b/public/emoji/1f52f.svg index e31b3e04c..7efa37243 100644 --- a/public/emoji/1f52f.svg +++ b/public/emoji/1f52f.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(36,4)" id="g20"><path id="path22" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(6.5239,25.1304)" id="g24"><path id="path26" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 11.485,-20.044 23.85,-0.007 0,0 Z m 11.476,-23.287 c -1.011,0 -1.928,0.588 -2.516,1.615 L -2.713,-1.298 c -0.602,1.05 -0.66,2.149 -0.159,3.013 C -2.399,2.532 -1.509,3 -0.431,3 l 24.816,0 c 1.09,0 1.979,-0.473 2.439,-1.296 0.485,-0.87 0.396,-1.962 -0.242,-2.998 L 13.951,-21.761 c -0.597,-0.969 -1.499,-1.526 -2.475,-1.526"/></g><g transform="translate(6.5283,11.5068)" id="g28"><path id="path30" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 23.85,-0.007 11.48,20.037 0,0 Z m 24.381,-3.007 -24.816,0 c -1.079,0 -1.968,0.469 -2.441,1.285 -0.501,0.866 -0.444,1.963 0.158,3.013 L 8.956,21.665 c 0.588,1.026 1.505,1.614 2.515,1.614 0.976,0 1.879,-0.556 2.476,-1.527 L 26.577,1.286 c 0.639,-1.035 0.728,-2.127 0.242,-2.996 -0.46,-0.824 -1.348,-1.297 -2.438,-1.297"/></g><g transform="translate(22,18)" id="g32"><path id="path34" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#F5F8FA" d="M18 34.156c-1.011 0-1.928-.588-2.516-1.614L3.811 12.168c-.602-1.05-.66-2.149-.159-3.014.473-.816 1.363-1.284 2.441-1.284h24.816c1.09 0 1.978.473 2.438 1.296.485.869.396 1.961-.242 2.997l-12.63 20.468c-.597.969-1.499 1.525-2.475 1.525zM6.524 10.87l11.485 20.044 12.365-20.038-23.85-.006z"/><path fill="#F5F8FA" d="M30.909 27.5H6.093c-1.079 0-1.968-.469-2.441-1.285-.501-.865-.443-1.963.159-3.013L15.484 2.829c.589-1.027 1.505-1.615 2.516-1.615.976 0 1.878.557 2.476 1.527l12.63 20.466c.639 1.035.728 2.127.242 2.996-.46.824-1.349 1.297-2.439 1.297zM6.528 24.493l23.85.007L18.009 4.457 6.528 24.493z"/><circle fill="#F5F8FA" cx="18" cy="18" r="4"/></svg> \ No newline at end of file |