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/303d.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/303d.svg')
-rw-r--r-- | public/emoji/303d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/303d.svg b/public/emoji/303d.svg index 8a8b08c0e..e2c5c4957 100644 --- a/public/emoji/303d.svg +++ b/public/emoji/303d.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.3613,6.8213)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -8.584,24.679 -11.811,24.679 -13.361,24.679 -3.125,0 -4.538,-3.18 -5.785,-5.985 -0.1,-0.225 -0.217,-0.485 -0.339,-0.754 -0.487,-0.939 -1.266,-0.939 -1.752,0 -0.123,0.269 -0.24,0.529 -0.34,0.754 -1.247,2.805 -2.66,5.985 -5.784,5.985 -2.304,0 -5.467,-2.084 -7.452,-12.01 -0.27,-1.354 0.607,-2.67 1.96,-2.942 1.352,-0.272 2.671,0.608 2.943,1.961 0.547,1.835 1.748,5.663 1.748,5.663 0.429,1.001 1.177,1.03 1.672,0.077 0.124,-0.273 0.243,-0.537 0.344,-0.764 0.183,-0.412 0.371,-0.832 0.566,-1.248 10e-4,-0.002 0.002,-0.005 0.003,-0.007 0.195,-0.416 0.399,-0.828 0.615,-1.226 0.001,-10e-4 0.002,-0.003 0.003,-0.004 1.043,-1.917 2.394,-3.5 4.598,-3.5 2.66,0 4.08,2.306 5.212,4.723 0.004,0.008 0.007,0.016 0.011,0.025 0.194,0.413 0.379,0.828 0.561,1.237 0.091,0.205 0.197,0.44 0.307,0.685 0.447,0.88 1.188,0.803 1.655,-0.182 0,0 3.902,-8.748 5.594,-12.52 0.8,-2.094 1.583,-4.231 2.298,-6.29 0.36,-1.032 1.328,-1.679 2.362,-1.679 0.272,0 0.55,0.045 0.821,0.139 C -0.236,-2.729 0.453,-1.304 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M35.361 29.179C26.777 4.5 23.551 4.5 22 4.5c-3.125 0-4.538 3.18-5.785 5.985-.1.225-.217.485-.339.754-.486.939-1.266.939-1.752 0-.122-.269-.239-.529-.339-.754C12.538 7.68 11.125 4.5 8 4.5 5.696 4.5 2.534 6.583.548 16.51c-.271 1.354.607 2.67 1.96 2.941 1.351.272 2.67-.607 2.942-1.96.547-1.835 1.748-5.663 1.748-5.663.429-1.001 1.177-1.031 1.672-.078.125.273.243.537.344.765.183.412.371.831.566 1.248l.003.007c.195.416.398.828.615 1.226l.003.004c1.043 1.917 2.394 3.5 4.598 3.5 2.661 0 4.08-2.307 5.212-4.724l.012-.024c.193-.413.379-.829.561-1.237.091-.205.197-.441.308-.685.446-.881 1.188-.803 1.654.182 0 0 3.902 8.748 5.594 12.519.801 2.095 1.583 4.231 2.299 6.29.359 1.032 1.327 1.68 2.361 1.68.272 0 .55-.045.821-.14 1.304-.454 1.993-1.879 1.54-3.182z"/></svg> \ No newline at end of file |