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/1f462.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/1f462.svg')
-rw-r--r-- | public/emoji/1f462.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f462.svg b/public/emoji/1f462.svg index 47948a931..641dd8b24 100644 --- a/public/emoji/1f462.svg +++ b/public/emoji/1f462.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(34.5391,2.5117)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.18,-0.215 1.18,-1.256 0,-1.043 -1.042,-1.256 -2.084,-1.256 l -17.72,0 c -2.085,0 -5.915,4 -7.915,4 l -0.592,-4 -6.408,0 0,2.936 c 0,2.084 -0.881,2.285 -0.881,3.211 0,2.084 0.672,4.394 0.672,4.394 l 6.746,-0.31 9.463,-7.231 L 0,0 Z"/></g><g transform="translate(1.668,8.7187)" id="g24"><path id="path26" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.036,-0.731 6.332,-1.719 13.969,-5.379 0,0 2,-1.34 4.363,-1.34 l 14.539,0 c 0,0 1.18,0.257 1.18,2.424 0,1.084 -7.907,3.381 -10.27,4.465 -2.361,1.084 -6.445,6.316 -6.445,6.316 0,0 -0.17,-13.634 -7.258,-6.049 C 2.99,8.025 5.7,6.877 3.337,6.877 2.852,6.877 -0.401,5.57 -1.207,1.838 -1.322,1.305 -0.864,0.209 0,0"/></g><g transform="translate(2,14)" id="g28"><path id="path30" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1,2 1,4 0,2 -1,17 -1,17 0,0 4.917,1 10,1 5.084,0 7,-1 7,-1 0,0 -6,-15 2,-23 2.55,-2.55 -2,-7 -2,-7 0,0 -1,-2 -4,0 C 10,-7 0,0 0,0"/></g><path id="path32" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,16 -2,0 0,20 2,0 0,-20 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M34.539 33.488s1.18.215 1.18 1.256c0 1.043-1.042 1.256-2.084 1.256h-17.72C13.831 36 10 32 8 32l-.592 4H1v-2.936c0-2.084-.881-2.285-.881-3.211 0-2.084.672-4.395.672-4.395L17 33l17.539.488z"/><path fill="#C1694F" d="M25.449 27.111C23.146 26.054 19.194 21.618 19 21.4 14.149 13.139 19 1 19 1s-1.916-1-7-1c-.674 0-1.343.018-2 .049L9 1 8 .182C4.616.47 2 1 2 1s1 15 1 17-.723 3.401-.723 3.401S.84 23.829.583 24.959c-.287 1.26.22 2.113 1.084 2.322C4.704 28.013 8 29 15.637 32.66c0 0 2 1.34 4.363 1.34h14.539s1.18-.257 1.18-2.424c0-1.084-7.907-3.381-10.27-4.465z"/><path fill="#D99E82" d="M10 20V.049c-.687.032-1.356.078-2 .133V20h2z"/></svg> \ No newline at end of file |