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/1f332.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/1f332.svg')
-rw-r--r-- | public/emoji/1f332.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f332.svg b/public/emoji/1f332.svg index 6c6ce5505..540f1860c 100644 --- a/public/emoji/1f332.svg +++ b/public/emoji/1f332.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(22,3)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-3 -4,-3 -2.209,0 -4,0.791 -4,3 l 1,9 c 0,2.209 0.791,2 3,2 2.209,0 3,0.209 3,-2 L 0,0 Z"/></g><g transform="translate(31.4063,8.7031)" id="g24"><path id="path26" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6.963,5.965 -9.783,14.506 -13.406,14.506 -3.624,0 -6.444,-8.541 -13.406,-14.506 -2.925,-2.507 -1.532,-3.957 2.479,-3.667 3.576,0.258 6.92,1.069 10.927,1.069 4.007,0 7.351,-0.811 10.926,-1.069 C 1.531,-3.957 2.925,-2.507 0,0"/></g><g transform="translate(29.1445,11.0664)" id="g28"><path id="path30" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.351,4.906 -8.357,11.934 -11.145,11.934 -2.784,0 -5.792,-7.028 -11.143,-11.934 -4.252,-3.898 5.572,-4.773 11.143,0 C -5.575,-4.773 4.251,-3.898 0,0"/></g><g transform="translate(29.1445,15.041)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.351,4.584 -8.357,11.148 -11.145,11.148 -2.784,0 -5.792,-6.564 -11.143,-11.148 -4.252,-3.642 5.572,-4.459 11.143,0 C -5.575,-4.459 4.251,-3.642 0,0"/></g><g transform="translate(26.7002,18.2969)" id="g36"><path id="path38" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.177,3.579 -6.524,8.703 -8.7,8.703 -2.174,0 -4.523,-5.124 -8.7,-8.703 -3.32,-2.844 4.35,-3.482 8.7,0 4.348,-3.482 12.019,-2.844 8.7,0"/></g><g transform="translate(26.7002,21.2744)" id="g40"><path id="path42" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.177,3.579 -6.524,8.703 -8.7,8.703 -2.174,0 -4.523,-5.124 -8.7,-8.703 -3.32,-2.844 4.35,-3.481 8.7,0 4.348,-3.481 12.019,-2.844 8.7,0"/></g><g transform="translate(25.0215,23.9189)" id="g44"><path id="path46" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.371,2.888 -5.266,7.024 -7.021,7.024 -1.755,0 -3.65,-4.136 -7.022,-7.024 -2.679,-2.295 3.511,-2.809 7.022,0 C -3.512,-2.809 2.68,-2.295 0,0"/></g><g transform="translate(25.0215,26.1606)" id="g48"><path id="path50" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.371,2.888 -5.266,7.024 -7.021,7.024 -1.755,0 -3.65,-4.136 -7.022,-7.024 -2.679,-2.295 3.511,-2.809 7.022,0 C -3.512,-2.809 2.68,-2.295 0,0"/></g><g transform="translate(23.3428,29.4604)" id="g52"><path id="path54" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.564,2.197 -4.007,5.345 -5.343,5.345 -6.678,5.345 -8.121,2.197 -10.686,0 -12.724,-1.747 -8.014,-2.138 -5.343,0 -2.672,-2.138 2.039,-1.747 0,0"/></g><g transform="translate(23.3428,30.6553)" id="g56"><path id="path58" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.564,2.197 -4.007,5.345 -5.343,5.345 -6.678,5.345 -8.121,2.197 -10.686,0 -12.724,-1.747 -8.014,-2.138 -5.343,0 -2.672,-2.138 2.039,-1.747 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M22 33c0 2.209-1.791 3-4 3s-4-.791-4-3l1-9c0-2.209.791-2 3-2s3-.209 3 2l1 9z"/><path fill="#5C913B" d="M31.406 27.297C24.443 21.332 21.623 12.791 18 12.791c-3.623 0-6.443 8.541-13.405 14.506-2.926 2.507-1.532 3.957 2.479 3.667 3.576-.258 6.919-1.069 10.926-1.069s7.352.812 10.926 1.069c4.012.29 5.405-1.16 2.48-3.667z"/><path fill="#3E721D" d="M29.145 24.934C23.794 20.027 20.787 13 18 13c-2.785 0-5.793 7.027-11.144 11.934-4.252 3.898 5.572 4.773 11.144 0 5.569 4.773 15.396 3.898 11.145 0z"/><path fill="#5C913B" d="M29.145 20.959C23.794 16.375 20.787 9.811 18 9.811c-2.785 0-5.793 6.564-11.144 11.148-4.252 3.642 5.572 4.459 11.144 0 5.569 4.459 15.396 3.642 11.145 0z"/><path fill="#3E721D" d="M26.7 17.703C22.523 14.125 20.176 9 18 9c-2.174 0-4.523 5.125-8.7 8.703-3.319 2.844 4.35 3.482 8.7 0 4.349 3.482 12.02 2.844 8.7 0z"/><path fill="#5C913B" d="M26.7 14.726c-4.177-3.579-6.524-8.703-8.7-8.703-2.174 0-4.523 5.125-8.7 8.703-3.319 2.844 4.35 3.481 8.7 0 4.349 3.481 12.02 2.843 8.7 0z"/><path fill="#3E721D" d="M25.021 12.081C21.65 9.193 19.756 5.057 18 5.057c-1.755 0-3.65 4.136-7.021 7.024-2.679 2.295 3.511 2.809 7.021 0 3.51 2.81 9.701 2.295 7.021 0z"/><path fill="#5C913B" d="M25.021 9.839C21.65 6.951 19.756 2.815 18 2.815c-1.755 0-3.65 4.136-7.021 7.024-2.679 2.295 3.511 2.809 7.021 0 3.51 2.81 9.701 2.295 7.021 0z"/><path fill="#3E721D" d="M23.343 6.54C20.778 4.342 19.336 1.195 18 1.195c-1.335 0-2.778 3.148-5.343 5.345-2.038 1.747 2.671 2.138 5.343 0 2.671 2.138 7.382 1.746 5.343 0z"/><path fill="#5C913B" d="M23.343 5.345C20.778 3.148 19.336 0 18 0c-1.335 0-2.778 3.148-5.343 5.345-2.038 1.747 2.671 2.138 5.343 0 2.671 2.138 7.382 1.746 5.343 0z"/></svg> \ No newline at end of file |