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/1f460.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/1f460.svg')
-rw-r--r-- | public/emoji/1f460.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f460.svg b/public/emoji/1f460.svg index 334ea75ec..f3aaf4490 100644 --- a/public/emoji/1f460.svg +++ b/public/emoji/1f460.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(35.4472,3.8796)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.098,-1.88 -2.874,-1.88 l -13.23,0 c -3.635,0 -4.391,4.18 -7.605,10.605 -3.212,6.427 -6.905,3.048 -6.905,3.048 l -1.215,-14.653 -1.284,0 c 0,0 -0.615,12.552 -1.25,14.596 -1.445,4.65 -0.625,8.182 -0.625,8.182 L -26.969,19.355 -16.87,3.831 0,0 Z"/></g><g transform="translate(30.4491,9.5026)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0 C -1.137,0.31 -1.874,0.625 -1.874,0.625 -2.387,0.091 -3.105,0 -3.749,0 c -3.825,0 -5.807,1.556 -8.122,6.873 -4.998,11.48 -13.224,16.244 -15.619,16.244 -2.552,0 -3.964,-11.871 -2.5,-11.871 4.607,0 8.415,-0.928 11.12,-3.749 4.042,-4.217 5.513,-13.12 8.116,-13.12 l 15.752,0 c 0,0 0.625,4.061 -4.998,5.623"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M35.447 32.12S34.349 34 32.573 34h-13.23c-3.635 0-4.391-4.179-7.604-10.605-3.213-6.427-6.906-3.048-6.906-3.048L3.618 35H2.334s-.614-12.551-1.25-14.596c-1.445-4.65-.625-8.181-.625-8.181l8.018.543 10.1 15.524 16.87 3.83z"/><path fill="#DD2E44" d="M30.449 26.497c-1.137-.31-1.874-.625-1.874-.625-.512.534-1.231.625-1.874.625-3.825 0-5.808-1.556-8.122-6.873C13.58 8.144 5.354 3.38 2.959 3.38.408 3.38-1.004 15.251.46 15.251c4.607 0 8.415.928 11.119 3.749 4.043 4.217 5.513 13.12 8.117 13.12h15.752s.624-4.061-4.999-5.623z"/></svg> \ No newline at end of file |