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/1f463.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/1f463.svg')
-rw-r--r-- | public/emoji/1f463.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f463.svg b/public/emoji/1f463.svg index c4ee494e6..bc37ac051 100644 --- a/public/emoji/1f463.svg +++ b/public/emoji/1f463.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(25.7764,31.2915)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.333,0 6.833,-1.333 6.833,-7.749 0,-6.418 -6.261,-15.731 -8.625,-15.959 -2.583,-0.25 -4.208,1.375 -4.208,4 0,2.625 4.083,4.334 2.208,8.291 C -5.667,-7.458 -6.125,0 0,0"/></g><g transform="translate(32.8574,29.0596)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.432,-0.733 -0.323,-1.598 0.242,-1.93 0.808,-2.263 1.616,-1.937 2.047,-1.203 2.479,-0.469 2.37,0.396 1.805,0.728 1.239,1.061 0.431,0.734 0,0"/></g><g transform="translate(29.9551,31.9224)" id="g28"><path id="path30" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.117,-0.843 0.342,-1.604 1.025,-1.699 1.709,-1.794 2.359,-1.188 2.477,-0.345 2.594,0.499 2.135,1.259 1.451,1.354 0.768,1.45 0.117,0.844 0,0"/></g><g transform="translate(26.7344,33.292)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.921 0.598,-1.667 1.334,-1.667 2.07,-1.667 2.667,-0.921 2.667,0 2.667,0.92 2.07,1.667 1.334,1.667 0.598,1.667 0,0.92 0,0"/></g><g transform="translate(22.9434,33.9795)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.024 0.635,-1.854 1.416,-1.854 0.783,0 1.417,0.83 1.417,1.854 0,1.024 -0.634,1.854 -1.417,1.854 C 0.635,1.854 0,1.024 0,0"/></g><g transform="translate(17.6357,31.8228)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.378,-1.459 1.605,-2.405 2.741,-2.111 3.878,-1.817 4.492,-0.396 4.114,1.063 3.737,2.522 2.511,3.468 1.374,3.174 0.237,2.88 -0.377,1.458 0,0"/></g><g transform="translate(9.917,24.2915)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.333,0 -6.833,-1.333 -6.833,-7.749 0,-6.418 6.261,-15.731 8.625,-15.96 2.583,-0.25 4.208,1.375 4.208,4.001 0,2.625 -4.083,4.334 -2.208,8.291 C 5.667,-7.458 6.125,0 0,0"/></g><g transform="translate(2.8364,22.0596)" id="g48"><path id="path50" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.432,-0.733 0.323,-1.598 -0.242,-1.93 -0.566,-0.333 -1.375,-0.007 -1.805,0.727 -0.432,0.734 -0.324,1.598 0.241,1.931 C -1.24,1.061 -0.431,0.734 0,0"/></g><g transform="translate(5.7383,24.9224)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.117,-0.843 -0.342,-1.604 -1.025,-1.699 -0.684,-0.095 -1.334,0.511 -1.452,1.354 -0.117,0.844 0.342,1.604 1.026,1.699 C -0.767,1.45 -0.118,0.844 0,0"/></g><g transform="translate(8.9585,26.292)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.921 -0.597,-1.667 -1.333,-1.667 -0.737,0 -1.334,0.746 -1.334,1.667 0,0.92 0.597,1.667 1.334,1.667 C -0.597,1.667 0,0.92 0,0"/></g><g transform="translate(12.75,26.9795)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.024 -0.634,-1.854 -1.417,-1.854 -0.782,0 -1.416,0.83 -1.416,1.854 0,1.024 0.634,1.854 1.416,1.854 C -0.634,1.854 0,1.024 0,0"/></g><g transform="translate(18.0576,24.8228)" id="g64"><path id="path66" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.377,-1.46 -1.605,-2.405 -2.741,-2.111 -1.136,0.294 -1.751,1.715 -1.374,3.174 0.377,1.459 1.604,2.405 2.741,2.111 C -0.238,2.88 0.377,1.458 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M25.776 4.708c1.333 0 6.833 1.333 6.833 7.75s-6.261 15.73-8.625 15.959c-2.583.25-4.208-1.375-4.208-4s4.083-4.334 2.208-8.292-2.333-11.417 3.792-11.417zm7.081 2.232c-.432.733-.323 1.598.242 1.93.565.333 1.374.007 1.805-.727.432-.734.323-1.599-.242-1.931-.565-.332-1.374-.006-1.805.728zm-2.902-2.862c-.117.843.342 1.604 1.025 1.699.684.095 1.334-.511 1.451-1.355.117-.843-.342-1.604-1.025-1.699-.683-.095-1.334.511-1.451 1.355zm-3.221-1.37c0 .921.598 1.667 1.334 1.667.736 0 1.333-.746 1.333-1.667 0-.92-.597-1.667-1.333-1.667s-1.334.747-1.334 1.667zm-3.791-.687c0 1.024.635 1.854 1.416 1.854.783 0 1.417-.83 1.417-1.854S25.142.167 24.359.167c-.781 0-1.416.83-1.416 1.854zm-5.307 2.156c.378 1.459 1.604 2.405 2.741 2.111 1.137-.294 1.751-1.715 1.373-3.174-.377-1.459-1.604-2.404-2.74-2.11-1.137.293-1.751 1.715-1.374 3.173zm-7.719 7.531c-1.333 0-6.833 1.333-6.833 7.75s6.261 15.73 8.625 15.959c2.583.25 4.208-1.375 4.208-4s-4.083-4.334-2.208-8.292 2.333-11.417-3.792-11.417zM2.836 13.94c.432.733.323 1.598-.242 1.93-.566.333-1.375.007-1.805-.727-.432-.734-.323-1.599.242-1.931.566-.332 1.374-.006 1.805.728zm2.902-2.862c.117.843-.342 1.604-1.025 1.699-.684.095-1.334-.511-1.451-1.354-.117-.843.342-1.604 1.025-1.699.684-.096 1.334.51 1.451 1.354zm3.22-1.37c0 .921-.597 1.667-1.333 1.667s-1.333-.746-1.333-1.667c0-.92.597-1.667 1.333-1.667.737.001 1.333.747 1.333 1.667zm3.792-.687c0 1.024-.634 1.854-1.417 1.854s-1.417-.83-1.417-1.854.634-1.854 1.417-1.854 1.417.83 1.417 1.854zm5.308 2.156c-.377 1.459-1.604 2.405-2.741 2.111-1.137-.294-1.752-1.715-1.374-3.174.377-1.459 1.604-2.404 2.74-2.11 1.137.293 1.752 1.715 1.375 3.173z" fill="#662113"/></svg> \ No newline at end of file |