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/1f42b.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/1f42b.svg')
-rw-r--r-- | public/emoji/1f42b.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f42b.svg b/public/emoji/1f42b.svg index a6b76e272..8d60286e9 100644 --- a/public/emoji/1f42b.svg +++ b/public/emoji/1f42b.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.7793,14.2129)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.04,0.159 -0.943,3.684 -3.443,7.198 -0.105,0.261 -0.224,0.527 -0.363,0.797 -1.906,3.714 -2.442,10.793 -5.372,10.793 -2.929,0 -1.859,-4.279 -4.721,-4.279 -2.863,0 -2.077,4.279 -5.236,4.279 -3.16,0 -3.452,-7.066 -5.295,-10.184 -0.028,-0.05 -0.054,-0.102 -0.082,-0.152 -0.26,0.517 -0.275,1.026 -0.26,1.535 0.015,0.515 -0.316,2.08 -1.256,3.361 0.685,0.129 1.183,0.563 1.155,1.05 -0.032,0.551 -0.728,0.959 -1.555,0.911 -0.534,-0.031 -0.989,-0.246 -1.238,-0.542 -0.292,0.146 -0.609,0.263 -0.957,0.335 -0.553,0.116 -0.538,-0.911 -3.028,-0.911 -2.49,0 -4.133,-3.998 -1.849,-3.998 2.284,0 4.388,0.113 4.701,-1.088 0.29,-1.119 -0.587,-3.537 -0.148,-4.997 0.379,-1.261 1.088,-2.283 1.927,-3.11 1.934,-2.086 3.746,-10.069 3.688,-12.062 -0.06,-1.999 1.939,-2.058 1.999,-0.059 0.035,1.212 -0.103,4.05 0.143,6.44 0.658,-3.122 0.935,-6.755 0.898,-7.972 -0.059,-1.999 1.941,-2.058 2,-0.059 0.047,1.621 -0.191,7.14 0.584,9.989 0.509,-0.023 1.04,-0.037 1.593,-0.042 1.564,-0.079 3.261,0.17 4.855,0.565 1.274,-2.243 2.65,-4.45 2.633,-4.986 -0.029,-1 -1.117,-3.968 -1.146,-4.968 -0.03,-0.999 0.94,-2.029 1.999,-0.059 0.553,1.029 1.125,3.067 1.414,5.068 0.633,-1.114 1.091,-1.985 1.083,-2.294 -0.03,-1 -1.064,-2.124 -1.093,-3.124 -0.029,-0.999 0.94,-2.029 1.999,-0.059 1.058,1.97 2.092,3.094 1.151,5.122 -0.718,1.551 -0.817,6.551 -0.353,9.706 0.126,0.235 0.228,0.482 0.319,0.735 0.928,-1.928 1.309,-3.401 1.315,-3.424 0.114,-0.454 0.521,-0.757 0.968,-0.757 0.081,0 0.163,0.01 0.244,0.03 C -0.191,-1.077 0.134,-0.535 0,0"/></g><g transform="translate(8.0972,27.2866)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.016,-0.552 -0.477,-0.986 -1.029,-0.97 -0.552,0.016 -0.986,0.477 -0.97,1.029 0.016,0.552 0.477,0.986 1.029,0.97 C -0.418,1.013 0.017,0.552 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M35.779 21.787c-.04-.159-.943-3.684-3.443-7.198-.104-.262-.224-.527-.362-.797C30.067 10.078 29.531 3 26.602 3s-1.859 4.279-4.722 4.279S19.804 3 16.645 3c-3.16 0-3.452 7.065-5.295 10.184-.029.049-.054.102-.082.151-.26-.517-.275-1.026-.26-1.535.015-.516-.316-2.081-1.256-3.361.685-.129 1.184-.563 1.156-1.05-.032-.551-.729-.96-1.556-.911-.535.031-.99.246-1.238.542-.293-.146-.61-.263-.957-.335-.554-.116-.539.911-3.029.911-2.49 0-4.133 3.998-1.849 3.998s4.388-.113 4.701 1.088c.29 1.119-.587 3.537-.147 4.997.379 1.261 1.088 2.283 1.927 3.11 1.934 2.086 3.746 10.069 3.687 12.062-.059 1.999 1.94 2.058 1.999.059.036-1.212-.102-4.05.144-6.44.658 3.122.934 6.755.898 7.973-.059 1.999 1.94 2.058 1.999.059.048-1.621-.19-7.14.585-9.989.509.024 1.04.037 1.593.042 1.564.079 3.262-.17 4.855-.564 1.273 2.243 2.649 4.45 2.633 4.985-.029 1-1.117 3.969-1.146 4.969-.029.999.94 2.028 1.999.059.554-1.029 1.125-3.066 1.414-5.067.634 1.113 1.092 1.984 1.083 2.294-.029 1-1.064 2.124-1.093 3.124-.029.999.94 2.028 1.999.059 1.059-1.97 2.092-3.094 1.151-5.122-.719-1.551-.817-6.551-.354-9.706.126-.235.229-.482.319-.735.928 1.929 1.309 3.401 1.314 3.425.114.454.521.757.969.757.081 0 .163-.01.244-.03.536-.139.861-.681.727-1.216z"/><path fill="#292F33" d="M8.097 8.713c-.016.552-.477.987-1.029.97-.552-.016-.986-.477-.97-1.029.016-.552.477-.986 1.029-.97.552.017.987.477.97 1.029z"/></svg> \ No newline at end of file |