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/1f358.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/1f358.svg')
-rw-r--r-- | public/emoji/1f358.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f358.svg b/public/emoji/1f358.svg index f59e71bc0..f35a02eaf 100644 --- a/public/emoji/1f358.svg +++ b/public/emoji/1f358.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="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" d="M 1,18 C 1,8.611 8.609,1 18,1 l 0,0 c 9.391,0 17,7.611 17,17 l 0,0 c 0,9.389 -7.609,17 -17,17 l 0,0 C 8.609,35 1,27.389 1,18"/></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,18)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.389 -7.609,-17 -17,-17 -9.391,0 -17,7.611 -17,17 0,9.389 7.609,17 17,17 C -7.609,17 0,9.389 0,0"/></g><g transform="translate(27.2578,8.3584)" id="g24"><path id="path26" style="fill:#e29386;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,-0.316 -1.091,-0.199 -1.406,0.263 -0.316,0.46 -0.198,1.091 0.261,1.406 l 1.67,1.144 C 0.985,3.128 1.614,3.011 1.931,2.55 2.246,2.09 2.129,1.459 1.668,1.145 L 0,0 Z"/></g><g transform="translate(29.6963,15.4531)" id="g28"><path id="path30" style="fill:#e29386;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.512,0.207 -0.758,0.792 -0.549,1.303 -0.34,1.814 0.244,2.06 0.755,1.852 L 2.607,1.097 C 3.118,0.889 3.364,0.306 3.156,-0.206 2.948,-0.718 2.364,-0.964 1.852,-0.755 L 0,0 Z"/></g><g transform="translate(25.2021,20.709)" id="g32"><path id="path34" style="fill:#e29386;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.519,0.21 -0.768,0.801 -0.555,1.318 0.209,0.517 0.801,0.766 1.317,0.556 L 2.637,1.11 C 3.152,0.899 3.401,0.31 3.19,-0.208 2.979,-0.725 2.391,-0.974 1.872,-0.763 L 0,0 Z"/></g><g transform="translate(4.2012,13.709)" id="g36"><path id="path38" style="fill:#e29386;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.517,0.21 -0.766,0.801 -0.554,1.318 0.21,0.517 0.801,0.766 1.318,0.556 L 2.637,1.11 C 3.154,0.899 3.402,0.31 3.192,-0.208 2.981,-0.726 2.391,-0.975 1.874,-0.764 L 0,0 Z"/></g><g transform="translate(7.7578,19.8584)" id="g40"><path id="path42" style="fill:#e29386;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,-0.316 -1.091,-0.199 -1.406,0.264 -0.316,0.46 -0.198,1.09 0.261,1.405 l 1.67,1.144 C 0.985,3.128 1.614,3.011 1.931,2.55 2.246,2.09 2.129,1.459 1.668,1.144 L 0,0 Z"/></g><g transform="translate(16.7861,16.1191)" id="g44"><path id="path46" style="fill:#e29386;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.768,0.312 -1.137,1.189 -0.824,1.956 -0.51,2.722 0.365,3.091 1.132,2.779 L 3.91,1.646 C 4.677,1.334 5.046,0.46 4.734,-0.308 4.422,-1.075 3.546,-1.444 2.778,-1.132 L 0,0 Z"/></g><g transform="translate(10.6016,10.0674)" id="g48"><path id="path50" style="fill:#e29386;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.522,0.199 1.106,-0.062 1.306,-0.586 1.503,-1.105 1.239,-1.691 0.718,-1.889 l -1.892,-0.72 c -0.518,-0.2 -1.103,0.063 -1.302,0.586 -0.2,0.523 0.063,1.106 0.585,1.306 L 0,0 Z"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(26,3)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -12,0 c -1.104,0 -2,0.895 -2,2 l 0,12 c 0,1.105 0.896,2 2,2 l 12,0 c 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#C1694F" cx="18" cy="18" r="17"/><path fill="#E29386" d="M27.258 27.642c-.461.316-1.091.199-1.406-.263-.316-.46-.198-1.091.262-1.406l1.67-1.144c.46-.315 1.089-.198 1.405.263.315.46.198 1.091-.263 1.405l-1.668 1.145zm2.438-7.095c-.512-.207-.758-.792-.549-1.303.209-.511.793-.757 1.304-.549l1.852.755c.511.208.757.791.549 1.303-.208.512-.792.758-1.304.549l-1.852-.755zm-4.494-5.256c-.519-.21-.767-.801-.555-1.318.209-.517.801-.766 1.316-.556l1.875.764c.516.211.765.801.554 1.318-.211.517-.8.766-1.318.555l-1.872-.763zm-21.001 7c-.517-.21-.766-.801-.554-1.318.21-.517.801-.766 1.317-.556l1.873.764c.518.211.766.801.556 1.318-.211.518-.802.767-1.318.556l-1.874-.764zm3.557-6.149c-.461.316-1.091.199-1.406-.264-.315-.46-.198-1.09.262-1.405l1.67-1.144c.46-.315 1.089-.198 1.405.263.315.46.198 1.091-.263 1.406l-1.668 1.144zm9.028 3.739c-.767-.312-1.137-1.188-.824-1.956.314-.766 1.189-1.135 1.956-.823l2.778 1.134c.767.312 1.136 1.186.824 1.953-.312.768-1.188 1.137-1.956.824l-2.778-1.132zm-6.184 6.052c.522-.199 1.106.062 1.306.586.197.519-.066 1.105-.588 1.303l-1.892.721c-.519.199-1.104-.063-1.302-.586-.2-.524.062-1.107.585-1.307l1.891-.717z"/><path fill="#292F33" d="M24 19H12c-1.104 0-2 .896-2 2v11.998C12.385 34.273 15.106 35 18 35c2.893 0 5.615-.727 8-2.002V21c0-1.104-.896-2-2-2z"/></svg> \ No newline at end of file |