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/1f962.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/1f962.svg')
-rw-r--r-- | public/emoji/1f962.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f962.svg b/public/emoji/1f962.svg index fc0317548..adde7aa51 100644 --- a/public/emoji/1f962.svg +++ b/public/emoji/1f962.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(2.3799,2.8401)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0 C -0.512,0.324 1.13,3.04 1.453,3.577 L 17.659,31.38 c 0.933,1.549 1.936,1.551 2.846,0.974 l 0,0 c 0.91,-0.576 1.337,-1.484 0.334,-2.99 L 2.703,2.91 C 2.356,2.388 0.512,-0.324 0,0"/></g><g transform="translate(22.8851,35.1946)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.91,0.577 -1.913,0.575 -2.846,-0.974 l -3.357,-5.759 c 0.336,-0.92 1.924,-1.75 2.901,-1.561 L 0.334,-2.99 C 1.336,-1.485 0.91,-0.577 0,0"/></g><g transform="translate(5.5837,0.8019)" id="g28"><path id="path30" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.414,0.443 1.885,2.593 2.333,3.031 l 22.649,22.9 c 1.293,1.265 2.265,1.014 3.001,0.227 l 0,0 c 0.735,-0.787 0.92,-1.773 -0.429,-2.978 L 2.958,1.868 C 2.491,1.451 0.414,-0.443 0,0"/></g><g transform="translate(33.5662,26.9601)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.736,0.787 -1.707,1.037 -3,-0.227 l -4.576,-4.627 c 0.057,-0.93 1.498,-2.183 2.376,-2.259 l 4.771,4.135 C 0.92,-1.773 0.736,-0.787 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M2.38 33.16c-.512-.324 1.13-3.04 1.453-3.577L20.039 1.78C20.972.231 21.976.229 22.886.806c.91.577 1.336 1.485.334 2.99L5.083 30.25c-.347.521-2.191 3.234-2.703 2.91z"/><path fill="#662113" d="M22.885.805c-.91-.577-1.913-.575-2.846.974l-3.356 5.758c.335.921 1.924 1.75 2.901 1.562l3.636-5.304c1.002-1.505.575-2.413-.335-2.99z"/><path fill="#C1694F" d="M5.584 35.198c-.414-.443 1.885-2.593 2.333-3.031l22.649-22.9c1.293-1.265 2.265-1.014 3-.227.736.787.92 1.773-.429 2.978L8.542 33.33c-.468.417-2.545 2.311-2.958 1.868z"/><path fill="#662113" d="M33.566 9.04c-.736-.787-1.707-1.037-3 .227l-4.576 4.627c.057.93 1.498 2.183 2.376 2.259l4.772-4.135c1.348-1.205 1.164-2.191.428-2.978z"/></svg> \ No newline at end of file |