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/1f51a.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/1f51a.svg')
-rw-r--r-- | public/emoji/1f51a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f51a.svg b/public/emoji/1f51a.svg index 27825d360..3d45f5d61 100644 --- a/public/emoji/1f51a.svg +++ b/public/emoji/1f51a.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(34,32.9995)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -21.525,0 0,1.873 c 0,1.046 -0.741,1.434 -1.645,0.865 l -10.14,-6.389 c -0.905,-0.57 -0.922,-1.527 -0.038,-2.128 l 10.216,-6.931 c 0.883,-0.601 1.607,-0.235 1.607,0.811 l 0,1.899 L 0,-10 c 1.105,0 2,0.896 2,2 l 0,6 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(0.0884,13.085)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.03 0.515,1.791 1.606,1.791 l 5.109,0 c 0.989,0 1.462,-0.7 1.462,-1.421 0,-0.7 -0.494,-1.421 -1.462,-1.421 l -3.625,0 0,-3.008 3.378,0 c 1.009,0 1.503,-0.699 1.503,-1.421 0,-0.699 -0.515,-1.419 -1.503,-1.419 l -3.378,0 0,-3.131 3.81,0 c 0.989,0 1.463,-0.701 1.463,-1.421 0,-0.701 -0.495,-1.422 -1.463,-1.422 l -5.314,0 C 0.68,-12.873 0,-12.256 0,-11.329 L 0,0 Z"/></g><g transform="translate(9.5068,13.3936)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.029 0.659,1.606 1.544,1.606 0.392,0 1.03,-0.309 1.298,-0.679 l 6.529,-8.712 0.041,0 0,7.785 c 0,1.029 0.659,1.606 1.545,1.606 0.886,0 1.545,-0.577 1.545,-1.606 l 0,-11.699 c 0,-1.031 -0.659,-1.607 -1.545,-1.607 -0.391,0 -1.009,0.309 -1.297,0.681 l -6.53,8.608 -0.041,0 0,-7.682 c 0,-1.031 -0.659,-1.607 -1.545,-1.607 C 0.659,-13.306 0,-12.73 0,-11.699 L 0,0 Z"/></g><g transform="translate(26.8359,3.0547)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.08,0 C 4.736,0 5.952,1.957 5.952,4.429 5.952,7.065 4.717,8.98 1.874,8.98 L 0,8.98 0,0 Z m -3.09,10.235 c 0,0.949 0.659,1.586 1.586,1.586 l 3.419,0 c 4.612,0 7.249,-2.965 7.249,-7.537 0,-4.326 -2.801,-7.127 -7.043,-7.127 l -3.584,0 c -0.68,0 -1.627,0.37 -1.627,1.544 l 0,11.534 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M34 3H12.475V1.128c0-1.046-.74-1.434-1.644-.865L.69 6.652c-.905.57-.922 1.527-.038 2.127l10.215 6.931c.884.602 1.607.235 1.607-.811V13H34c1.104 0 2-.896 2-2V5c0-1.104-.896-2-2-2zM.088 22.915c0-1.03.515-1.791 1.606-1.791h5.108c.989 0 1.462.7 1.462 1.421 0 .7-.495 1.421-1.462 1.421H3.178v3.008h3.378c1.009 0 1.503.699 1.503 1.421 0 .699-.515 1.42-1.503 1.42H3.178v3.131h3.811c.988 0 1.462.701 1.462 1.421 0 .701-.495 1.422-1.462 1.422H1.675c-.906 0-1.586-.617-1.586-1.544v-11.33zm9.419-.309c0-1.029.659-1.606 1.545-1.606.392 0 1.03.31 1.298.68l6.529 8.712h.041v-7.785c0-1.029.659-1.606 1.545-1.606.886 0 1.545.577 1.545 1.606v11.699c0 1.03-.659 1.606-1.545 1.606-.391 0-1.009-.309-1.297-.681l-6.53-8.608h-.041v7.683c0 1.03-.659 1.606-1.544 1.606s-1.545-.576-1.545-1.606v-11.7zm14.239.104c0-.948.659-1.586 1.586-1.586h3.419c4.612 0 7.249 2.965 7.249 7.537 0 4.326-2.801 7.127-7.043 7.127h-3.584c-.68 0-1.627-.37-1.627-1.544V22.71zm3.09 10.235h2.08c2.656 0 3.872-1.957 3.872-4.429 0-2.637-1.235-4.551-4.078-4.551h-1.874v8.98z"/></svg> \ No newline at end of file |