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/1f442-1f3fe.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/1f442-1f3fe.svg')
| -rw-r--r-- | public/emoji/1f442-1f3fe.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f442-1f3fe.svg b/public/emoji/1f442-1f3fe.svg index 1099e8151..f54144b39 100644 --- a/public/emoji/1f442-1f3fe.svg +++ b/public/emoji/1f442-1f3fe.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(31,22)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,-6 -5,-8 -6,-13 -1.606,-8.034 -6.267,-9 -11,-9 -7.75,0 -3.856,7.568 -7,17 -3,9 -2.716,15.899 7,18 C -7.75,15 1.634,9.806 0,0"/></g><g transform="translate(23.999,14)" id="g24"><path id="path26" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.19,0 -0.383,0.055 -0.554,0.168 -0.46,0.307 -0.584,0.927 -0.277,1.387 0.491,0.737 0.968,1.34 1.429,1.923 1.395,1.766 2.403,3.042 2.403,6.522 0,2.21 -0.782,3.975 -2.323,5.246 -2.194,1.806 -5.827,2.485 -9.486,1.773 -1.861,-0.363 -3.193,-1.215 -4.074,-2.604 -2.061,-3.254 -0.827,-8.244 -0.814,-8.294 0.135,-0.535 -0.188,-1.079 -0.723,-1.215 -0.538,-0.139 -1.08,0.188 -1.216,0.723 -0.06,0.238 -1.453,5.883 1.064,9.856 1.174,1.853 2.984,3.029 5.381,3.496 4.227,0.826 8.496,-0.014 11.139,-2.192 C 3.945,15.145 5.001,12.797 5.001,10 5.001,5.825 3.624,4.083 2.166,2.237 1.73,1.686 1.279,1.115 0.833,0.445 0.641,0.156 0.323,0 0,0"/></g><g transform="translate(11.5845,9.083)" id="g28"><path id="path30" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.367,0 -0.72,0.202 -0.896,0.553 -0.551,1.102 -0.367,1.995 -0.115,2.549 0.545,1.202 1.916,1.935 2.924,2.199 1.997,0.668 2.975,3.34 2.442,5.181 -0.571,1.974 -2.651,2.673 -5.7,1.922 -0.53,-0.134 -1.078,0.195 -1.21,0.732 -0.133,0.536 0.195,1.078 0.731,1.21 4.914,1.214 7.407,-0.914 8.1,-3.308 C 7.074,8.283 5.712,4.461 2.482,3.385 1.893,3.228 1.048,2.8 0.81,2.275 0.742,2.126 0.678,1.879 0.893,1.447 1.141,0.953 0.94,0.352 0.446,0.105 0.303,0.034 0.15,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AF7E57" d="M31 14c-1 6-5 8-6 13-1.606 8.034-6.267 9-11 9-7.75 0-3.856-7.568-7-17-3-9-2.716-15.899 7-18 9.25-2 18.634 3.194 17 13z"/><path fill="#90603E" d="M23.999 22c-.19 0-.383-.055-.554-.168-.46-.307-.584-.927-.277-1.387.491-.737.968-1.34 1.429-1.923C25.992 16.756 27 15.481 27 12c0-2.21-.782-3.975-2.323-5.246-2.193-1.806-5.827-2.486-9.485-1.773-1.861.363-3.194 1.215-4.074 2.604-2.061 3.253-.827 8.243-.814 8.293.136.535-.188 1.08-.723 1.215-.538.139-1.08-.188-1.215-.723-.061-.238-1.454-5.883 1.063-9.856 1.174-1.853 2.984-3.029 5.381-3.497 4.227-.825 8.496.015 11.14 2.192C27.944 6.855 29 9.203 29 12c0 4.175-1.377 5.917-2.835 7.763-.436.552-.887 1.122-1.333 1.792-.192.289-.51.445-.833.445z"/><path fill="#90603E" d="M11.585 26.917c-.367 0-.72-.202-.896-.553-.551-1.103-.367-1.995-.116-2.549.545-1.202 1.916-1.935 2.924-2.199 1.997-.668 2.975-3.34 2.442-5.181-.572-1.974-2.651-2.673-5.701-1.922-.53.134-1.078-.194-1.21-.731-.132-.536.195-1.078.731-1.21 4.914-1.214 7.407.914 8.1 3.308.798 2.755-.564 6.577-3.794 7.653-.588.156-1.434.585-1.672 1.109-.068.149-.132.396.083.828.247.494.047 1.095-.447 1.342-.142.071-.295.105-.444.105z"/></svg> \ No newline at end of file |
