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/1f427.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/1f427.svg')
-rw-r--r-- | public/emoji/1f427.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f427.svg b/public/emoji/1f427.svg index b83882c12..fe34d91a9 100644 --- a/public/emoji/1f427.svg +++ b/public/emoji/1f427.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(28.0684,4.6445)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.229,0 -8.468,-0.785 -10.068,-1.832 -11.669,-0.785 -17.908,0 -20.137,0 c -2.565,0 -1.161,-1.039 -1.161,-2.322 0,-1.282 -1.404,-2.323 1.161,-2.323 2.229,0 8.468,0.786 10.069,1.832 1.6,-1.046 7.839,-1.832 10.068,-1.832 2.565,0 1.161,1.041 1.161,2.323 C 1.161,-1.039 2.565,0 0,0"/></g><g transform="translate(31.7305,20.1338)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.25,2.499 -3.152,4.995 -4.942,6.723 -2.452,5.432 -6.03,9.143 -8.788,9.143 -2.759,0 -6.337,-3.71 -8.788,-9.142 -1.791,-1.729 -3.693,-4.225 -4.943,-6.724 -2.438,-4.876 -3.116,-11.426 -2.078,-11.944 0.873,-0.437 2.324,1.551 4.208,5.082 0.267,-10.876 7.047,-10.95 11.601,-10.95 4.552,0 11.333,0.074 11.6,10.948 1.884,-3.529 3.335,-5.517 4.207,-5.08 C 3.115,-11.426 2.438,-4.876 0,0"/></g><g transform="translate(21.6748,29.0566)" id="g28"><path id="path30" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.85,-0.607 -2.172,-1.186 -3.675,-1.186 -1.503,0 -2.825,0.579 -3.675,1.186 -3.302,-2.137 -5.615,-7.061 -5.615,-12.799 0,-7.695 4.159,-13.935 9.29,-13.935 5.132,0 9.291,6.24 9.291,13.935 C 5.616,-7.061 3.303,-2.137 0,0"/></g><g transform="translate(28.4521,30)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.808,0 c -3.847,0 -4.644,0.78 -4.644,1.743 0,0.962 -0.364,1.741 3.483,1.741 C -1.161,3.484 1.161,0 0,0"/></g><g transform="translate(16.8389,32.5166)" id="g36"><path id="path38" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.642 -0.52,-1.162 -1.161,-1.162 -0.642,0 -1.161,0.52 -1.161,1.162 0,0.641 0.519,1.161 1.161,1.161 C -0.52,1.161 0,0.641 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M28.068 31.355c-2.229 0-8.468.785-10.068 1.832-1.601-1.047-7.84-1.832-10.069-1.832-2.564 0-1.161 1.039-1.161 2.322C6.77 34.96 5.367 36 7.931 36c2.229 0 8.468-.785 10.069-1.832C19.601 35.215 25.84 36 28.068 36c2.565 0 1.161-1.04 1.161-2.322 0-1.283 1.405-2.323-1.161-2.323z"/><path fill="#292F33" d="M31.73 15.866c-1.25-2.499-3.152-4.995-4.942-6.723C24.337 3.711 20.759 0 18 0s-6.337 3.71-8.788 9.143c-1.791 1.729-3.693 4.224-4.943 6.724-2.438 4.876-3.116 11.426-2.078 11.944.873.437 2.324-1.552 4.208-5.082C6.667 33.604 13.446 33.678 18 33.678c4.553 0 11.333-.073 11.601-10.947 1.884 3.528 3.335 5.517 4.207 5.08 1.038-.519.361-7.069-2.078-11.945z"/><path fill="#F5F8FA" d="M21.675 6.943c-.85.607-2.172 1.186-3.675 1.186s-2.825-.578-3.675-1.185c-3.302 2.137-5.615 7.06-5.615 12.798 0 7.695 4.159 13.936 9.29 13.936 5.132 0 9.291-6.24 9.291-13.936 0-5.738-2.313-10.662-5.616-12.799z"/><path fill="#FFAC33" d="M28.452 6h-5.808C18.797 6 18 5.22 18 4.257c0-.962-.364-1.742 3.483-1.742C27.291 2.516 29.613 6 28.452 6z"/><path fill="#F5F8FA" d="M16.839 3.483c0 .642-.52 1.162-1.161 1.162-.642 0-1.161-.521-1.161-1.162 0-.641.52-1.161 1.161-1.161s1.161.52 1.161 1.161z"/></svg> \ No newline at end of file |