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/2604.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/2604.svg')
-rw-r--r-- | public/emoji/2604.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2604.svg b/public/emoji/2604.svg index 3d525c4c5..07df915c4 100644 --- a/public/emoji/2604.svg +++ b/public/emoji/2604.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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="m 16.626,22.349 c -0.266,1.059 0.971,4.281 1.324,5.164 l 0,0 C 10.579,24.159 3.683,13.251 5.9,14.141 l 0,0 c 5.399,2.165 8.883,-1.07 9.807,-3.751 l 0,0 c 0.225,-0.651 0.587,-0.588 0.833,0.117 l 0,0 C 18.565,16.325 23.112,26.945 27.836,31 l 0,0 C 25.187,29.72 17.729,24.203 16.626,22.349"/></clipPath><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" 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(3.6045,2.6709)" id="g20"><path id="path22" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.104,-1.413 5.518,-4.283 10.682,-0.53 3.246,2.359 4.242,7.519 7.15,14.433 1.986,4.723 6.444,13.595 12.668,17.611 1.941,0.971 0.22,1.721 -0.442,1.766 -1.149,0.077 -5.869,0.75 -17.522,-6.665 C 0.883,19.2 -5.25,6.72 0,0"/></g><g transform="translate(5.8999,14.1406)" id="g24"><path id="path26" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.217,-0.89 4.679,10.018 12.05,13.373 11.697,12.49 10.46,9.268 10.726,8.209 c 1.103,1.853 8.562,7.37 11.21,8.65 C 17.212,12.805 12.665,2.185 10.64,-3.634 10.395,-4.339 10.032,-4.401 9.807,-3.751 8.882,-1.07 5.398,2.166 0,0"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(5.2378,13.875)" id="g36"><path id="path38" style="fill:#bdddf4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.971,2.206 7.15,8.254 9.004,9.136 7.945,4.017 8.96,3.928 13.021,7.636 10.417,3.178 10.947,-3.002 10.77,-4.68 10.593,-6.355 -0.309,-3.178 -0.706,-1.456 -1.104,0.266 0,0 0,0"/></g></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><g transform="translate(14.0215,7.04)" id="g48"><path id="path50" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.925 -2.372,-5.296 -5.296,-5.296 -2.926,0 -5.297,2.371 -5.297,5.296 0,2.926 2.371,5.297 5.297,5.297 C -2.372,5.297 0,2.926 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#5DADEC" d="M33.662.049c-1.148-.077-5.869-.75-17.522 6.665C4.488 14.129-1.646 26.609 3.604 33.329c1.104 1.413 5.518 4.283 10.682.53 3.247-2.359 4.242-7.52 7.15-14.434 1.986-4.723 6.444-13.594 12.668-17.611 1.942-.97.22-1.72-.442-1.765z"/><path fill="#8CCAF7" d="M16.625 13.651c-.265-1.059.971-4.281 1.324-5.164-6.437 2.929-12.509 11.616-12.47 13.18.006.227.139.305.42.193 5.398-2.166 8.882 1.07 9.807 3.751.095.274.214.414.339.44.171.036.352-.15.494-.557C18.565 19.675 23.112 9.055 27.835 5c-2.648 1.28-10.106 6.797-11.21 8.651z"/><path fill="#BDDDF4" d="M14.242 12.989c-1.737.827-7.275 6.192-8.762 8.678.006.227.139.305.42.193 5.398-2.166 8.882 1.07 9.807 3.751.095.274.214.414.339.44.057-2.328-.092-7.616 2.213-11.561-4.061 3.707-5.076 3.618-4.017-1.501z"/><path fill="#F5F8FA" d="M8.725 23.663c-2.925 0-5.297 2.371-5.297 5.297 0 2.925 2.372 5.296 5.297 5.296s5.296-2.371 5.296-5.296c0-2.926-2.371-5.297-5.296-5.297z"/></svg> \ No newline at end of file |