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/1f92a.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/1f92a.svg')
-rw-r--r-- | public/emoji/1f92a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f92a.svg b/public/emoji/1f92a.svg index 579fb1c9d..baf58f21b 100644 --- a/public/emoji/1f92a.svg +++ b/public/emoji/1f92a.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,18)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.94,0 -18,8.059 -18,18 0,9.94 8.06,18 18,18 C -8.059,18 0,9.94 0,0"/></g><g transform="translate(31.0833,24.4271)" id="g24"><path id="path26" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.808 -3.087,-6.896 -6.896,-6.896 -3.808,0 -6.896,3.088 -6.896,6.896 0,3.808 3.088,6.896 6.896,6.896 C -3.087,6.896 0,3.808 0,0"/></g><g transform="translate(25.9839,24.4272)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.992 -0.804,-1.796 -1.796,-1.796 -0.993,0 -1.797,0.804 -1.797,1.796 0,0.992 0.804,1.796 1.797,1.796 C -0.804,1.796 0,0.992 0,0"/></g><g transform="translate(14.9581,22.4583)" id="g32"><path id="path34" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.175 -1.763,-3.937 -3.937,-3.937 -2.175,0 -3.938,1.762 -3.938,3.937 0,2.175 1.763,3.937 3.938,3.937 C -1.763,3.937 0,2.175 0,0"/></g><g transform="translate(12.9622,22.4583)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.072 -0.869,-1.942 -1.942,-1.942 -1.072,0 -1.941,0.87 -1.941,1.942 0,1.072 0.869,1.942 1.941,1.942 C -0.869,1.942 0,1.072 0,0"/></g><g transform="translate(18,15)" id="g40"><path id="path42" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.623,0 -6.027,0.422 -9,1 -0.679,0.131 -2,0 -2,-2 0,-4 4.595,-9 11,-9 6.404,0 11,5 11,9 C 11,1 9.679,1.132 9,1 6.027,0.422 3.623,0 0,0"/></g><g transform="translate(9,14)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 3,-1 9,-1 6,0 9,1 9,1 0,0 -2,-4 -9,-4 -7,0 -9,4 -9,4"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCB4C" d="M35.597 14.232c2.083 9.72-4.108 19.289-13.828 21.372C12.049 37.687 2.48 31.496.397 21.776-1.686 12.056 4.506 2.487 14.225.404c9.72-2.084 19.289 4.108 21.372 13.828"/><path fill="#F4F7F9" d="M29.284 9.012c.779 3.636-1.537 7.216-5.173 7.995-3.636.779-7.216-1.537-7.996-5.173-.779-3.636 1.537-7.216 5.173-7.995s7.217 1.536 7.996 5.173z"/><circle fill="#292F33" cx="22.306" cy="9.291" r="2.037"/><path fill="#F4F7F9" d="M14.088 14.282c.456 2.126-.899 4.219-3.025 4.675s-4.219-.899-4.675-3.025c-.456-2.126.899-4.219 3.025-4.675s4.219.899 4.675 3.025z"/><ellipse transform="rotate(-12.095 10.236 15.853)" fill="#292F33" cx="10.238" cy="15.857" rx="1.942" ry="1.942"/><path fill="#65471B" d="M18.625 20.937c-3.543.759-5.981.85-9.01.908-.691.015-1.955.419-1.536 2.375.838 3.911 6.379 7.837 12.642 6.495 6.262-1.342 9.708-7.194 8.87-11.105-.419-1.956-1.739-1.808-2.375-1.536-2.786 1.187-5.048 2.104-8.591 2.863z"/><path fill="#E8596E" d="M11 24.004v6c0 3 2 6 6 6s6-3 6-6v-6H11z"/><path fill="#DD2F45" d="M17 31.883c.301 0 .545-.244.545-.545v-6.295h-1.091v6.295c.001.301.245.545.546.545z"/><path fill="#FFF" d="M10.034 23.801s3.143.349 9.01-.908c5.867-1.257 8.591-2.864 8.591-2.864s-1.117 4.33-7.962 5.797c-6.845 1.467-9.639-2.025-9.639-2.025z"/></svg> \ No newline at end of file |