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/1f4b1.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/1f4b1.svg')
-rw-r--r-- | public/emoji/1f4b1.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4b1.svg b/public/emoji/1f4b1.svg index 66cee5e03..b67b0cd49 100644 --- a/public/emoji/1f4b1.svg +++ b/public/emoji/1f4b1.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(15.0679,21.7217)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.719 -8.7,4.411 -8.7,7.261 0,1.379 1.32,2.053 2.85,2.053 2.574,0 3.032,-1.655 4.198,-1.655 0.824,0 1.222,0.522 1.222,1.104 0,1.352 -2.052,2.378 -4.021,2.732 l 0,1.307 c 0,0.815 -0.659,1.476 -1.474,1.476 -0.817,0 -1.477,-0.661 -1.477,-1.476 l 0,-1.353 c -2.147,-0.489 -3.992,-1.977 -3.992,-4.404 0,-4.532 8.699,-4.349 8.699,-7.532 0,-1.103 -1.194,-2.207 -3.155,-2.207 -2.941,0 -3.921,1.992 -5.115,1.992 -0.582,0 -1.103,-0.49 -1.103,-1.231 0,-1.17 1.965,-2.581 4.667,-2.975 0,-0.002 -0.001,-0.006 -0.001,-0.01 l 0,-1.473 c 0,-0.818 0.661,-1.479 1.477,-1.479 0.815,0 1.476,0.661 1.476,1.479 l 0,1.473 c 0,0.018 -0.009,0.031 -0.009,0.047 C -2.027,-4.418 0,-2.832 0,0"/></g><g transform="translate(23.8965,10.124)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.104,0 c -0.688,0 -1.227,0.327 -1.227,0.985 0,0.662 0.539,0.991 1.227,0.991 l 2.875,0 -4.791,7.399 c -0.298,0.448 -0.45,0.775 -0.45,1.194 0,0.571 0.571,0.991 1.049,0.991 0.481,0 0.958,-0.21 1.378,-0.839 l 5.36,-8.058 5.363,8.058 c 0.419,0.629 0.897,0.839 1.378,0.839 0.477,0 1.046,-0.42 1.046,-0.991 0,-0.419 -0.149,-0.746 -0.449,-1.194 l -4.792,-7.399 2.875,0 c 0.69,0 1.229,-0.329 1.229,-0.991 C 7.967,0.327 7.428,0 6.738,0 l -4.101,0 0,-2.126 4.101,0 c 0.69,0 1.229,-0.332 1.229,-0.99 0,-0.658 -0.539,-0.987 -1.229,-0.987 l -4.101,0 0,-4.612 c 0,-0.868 -0.539,-1.41 -1.32,-1.41 -0.778,0 -1.317,0.542 -1.317,1.41 l 0,4.612 -4.104,0 c -0.688,0 -1.227,0.329 -1.227,0.987 0,0.658 0.539,0.99 1.227,0.99 L 0,-2.126 0,0 Z"/></g><g transform="translate(23.875,29.875)" id="g28"><path id="path30" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.875,4.125 4.125,-6.875 -4.125,-4.125 11,0 0,11 L 0,0 Z"/></g><g transform="translate(9.125,6.125)" id="g32"><path id="path34" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 6.875,-4.125 2.75,2.75 l 4.125,4.125 -11,0 0,-11 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M15.068 14.278c0-4.719-8.7-4.411-8.7-7.261 0-1.379 1.32-2.053 2.85-2.053 2.574 0 3.032 1.654 4.198 1.654.824 0 1.223-.521 1.223-1.103 0-1.353-2.053-2.378-4.021-2.732V1.476C10.617.661 9.958 0 9.143 0c-.817 0-1.477.661-1.477 1.476v1.353c-2.147.489-3.992 1.978-3.992 4.404 0 4.532 8.698 4.349 8.698 7.532 0 1.103-1.193 2.207-3.155 2.207-2.941 0-3.921-1.992-5.115-1.992-.582 0-1.103.49-1.103 1.23 0 1.17 1.965 2.581 4.667 2.976l-.001.01v1.473c0 .818.661 1.479 1.477 1.479.815 0 1.476-.661 1.476-1.479v-1.473c0-.018-.008-.031-.009-.047 2.431-.453 4.459-2.039 4.459-4.871zm8.828 11.598h-4.104c-.688 0-1.227-.327-1.227-.985 0-.661.539-.99 1.227-.99h2.876l-4.792-7.399c-.298-.449-.449-.775-.449-1.195 0-.571.57-.99 1.049-.99.481 0 .958.21 1.378.839l5.36 8.058 5.362-8.058c.419-.629.897-.839 1.378-.839.477 0 1.046.419 1.046.99 0 .42-.148.746-.448 1.195L27.76 23.9h2.875c.689 0 1.229.329 1.229.99 0 .658-.539.985-1.229.985h-4.102v2.126h4.102c.689 0 1.229.332 1.229.99 0 .658-.539.987-1.229.987h-4.102v4.611c0 .868-.539 1.41-1.319 1.41-.778 0-1.317-.542-1.317-1.41v-4.611h-4.104c-.688 0-1.227-.329-1.227-.987 0-.658.539-.99 1.227-.99h4.104v-2.125z"/><path fill="#67757F" d="M23.875 6.125L17 2l4.125 6.875L17 13h11V2zm-14.75 23.75L16 34l-4.125-6.875L16 23H5v11z"/></svg> \ No newline at end of file |