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/1f47a.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/1f47a.svg')
-rw-r--r-- | public/emoji/1f47a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f47a.svg b/public/emoji/1f47a.svg index 81c1ef39d..bb0db744a 100644 --- a/public/emoji/1f47a.svg +++ b/public/emoji/1f47a.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(28,15)" id="g20"><path id="path22" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -3,-15 -9,-15 l -8,0 c -6,0 -9,12.791 -9,15 l 0,17 c 0,2.209 1.791,4 4,4 l 18,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(14.4409,26.8286)" id="g24"><path id="path26" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.138,-2.343 2.715,-5.509 1.29,-7.071 -1.423,-1.562 -4.312,-0.928 -6.449,1.414 -2.136,2.343 -2.715,5.51 -1.289,7.071 C -5.024,2.976 -2.135,2.343 0,0"/></g><g transform="translate(15.9336,23.2935)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.609,-0.781 0.609,-2.048 0,-2.829 -0.606,-0.781 -1.593,-0.781 -2.201,0 -0.609,0.781 -0.609,2.048 0,2.828 C -1.593,0.781 -0.606,0.781 0,0"/></g><g transform="translate(21.7266,26.729)" id="g32"><path id="path34" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.826,-2.342 -2.318,-5.509 -1.1,-7.071 1.215,-1.562 3.68,-0.928 5.504,1.414 1.824,2.343 2.317,5.509 1.1,7.071 C 4.289,2.976 1.824,2.343 0,0"/></g><g transform="translate(21.1758,23.1934)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.609,-0.781 -0.609,-2.047 0,-2.828 0.607,-0.781 1.596,-0.781 2.201,0 0.612,0.781 0.612,2.047 0,2.828 C 1.596,0.781 0.607,0.781 0,0"/></g><g transform="translate(20.8916,25)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.43,0 -0.862,0.138 -1.227,0.422 -2.099,1.1 -2.256,2.357 -1.577,3.229 l 4.67,6 C 3.771,10.101 5.026,10.257 5.899,9.578 6.77,8.9 6.928,7.643 6.249,6.771 l -4.67,-6 C 1.185,0.265 0.596,0 0,0"/></g><g transform="translate(16.2212,25)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.596,0 -1.185,0.265 -1.58,0.771 l -4.672,6 c -0.679,0.872 -0.522,2.128 0.349,2.807 0.872,0.679 2.129,0.523 2.807,-0.349 l 4.673,-6 C 2.255,2.357 2.099,1.101 1.227,0.422 0.862,0.138 0.429,0 0,0"/></g><g transform="translate(24,4.999)" id="g48"><path id="path50" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.81,0 -1.571,0.496 -1.873,1.299 -1.977,1.558 -3.04,4.001 -6,4.001 c -2.96,0 -4.023,-2.443 -4.135,-2.722 -0.407,-1.017 -1.563,-1.527 -2.583,-1.133 -1.023,0.397 -1.539,1.531 -1.155,2.557 0.081,0.217 2.054,5.298 7.873,5.298 5.819,0 7.792,-5.081 7.873,-5.298 C 2.261,1.669 1.736,0.517 0.702,0.128 0.471,0.042 0.233,0 0,0"/></g><g transform="translate(18.5547,14)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 4.482,0.553 7.05,-4 9.869,-9 9.869,1 9.164,2 8.46,3 7.713,0.614 6.344,1.1 3.523,2.1 0,0 0,0"/></g><g transform="translate(18.5547,14)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -5.888,0.553 -9.263,-4 -3.703,-5 -3.703,5 -2.778,6 0.927,1 1.908,-1.725 3.706,-1.239 C -4.63,1.761 0,0 0,0"/></g><g transform="translate(32.2617,21)" id="g60"><path id="path62" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.09,0 -0.174,-0.02 -0.262,-0.029 l 0,0.029 -13.845,0 c -1.511,0 -2.735,-1.343 -2.735,-3 0,-1.657 1.224,-3 2.735,-3 l 13.845,0 0,0.029 C -0.174,-5.98 -0.09,-6 0,-6 c 1.513,0 2.738,1.343 2.738,3 0,1.656 -1.225,3 -2.738,3"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DA2F47" d="M28 21c0 2.209-3 15-9 15h-8c-6 0-9-12.791-9-15V4c0-2.209 1.791-4 4-4h18c2.209 0 4 1.791 4 4v17z"/><path fill="#F5F8FA" d="M14.441 9.171c2.138 2.343 2.715 5.509 1.29 7.071-1.422 1.561-4.312.928-6.448-1.415-2.137-2.343-2.715-5.509-1.29-7.071 1.424-1.561 4.313-.927 6.448 1.415z"/><path fill="#292F33" d="M15.934 12.707c.609.781.609 2.048 0 2.829-.607.781-1.593.781-2.201 0-.608-.781-.608-2.047 0-2.828.608-.782 1.594-.782 2.201-.001z"/><path fill="#F5F8FA" d="M21.727 9.271c-1.826 2.342-2.318 5.509-1.1 7.071 1.215 1.562 3.68.929 5.504-1.414 1.824-2.343 2.316-5.509 1.1-7.071-1.215-1.562-3.68-.929-5.504 1.414z"/><ellipse fill="#292F33" cx="22.276" cy="14.221" rx="1.557" ry="2"/><path fill="#292F33" d="M20.892 11c-.43 0-.862-.138-1.227-.422-.871-.678-1.028-1.935-.35-2.807l4.67-6c.679-.872 1.934-1.029 2.807-.35.871.678 1.028 1.935.35 2.807l-4.67 6c-.396.507-.985.772-1.58.772zm-4.671 0c-.596 0-1.185-.265-1.58-.771l-4.672-6c-.679-.872-.522-2.128.349-2.807.872-.679 2.129-.523 2.807.349l4.672 6c.679.872.522 2.128-.349 2.807-.365.284-.798.422-1.227.422z"/><path fill="#FDD888" d="M24 31.001c-.81 0-1.571-.496-1.873-1.299C22.023 29.443 20.96 27 18 27s-4.023 2.443-4.135 2.722c-.407 1.018-1.563 1.527-2.583 1.133-1.022-.396-1.539-1.53-1.154-2.557C10.208 28.081 12.181 23 18 23s7.792 5.081 7.873 5.298c.388 1.034-.137 2.187-1.171 2.575-.231.086-.469.128-.702.128z"/><path fill="#292F33" d="M18.555 22s4.482-.553 7.05 4c2.819 5 2.819-5 2.114-6-.704-1-1.451 1.386-2.82.9-2.821-1-6.344 1.1-6.344 1.1zm0 0s-5.888-.553-9.263 4c-3.703 5-3.703-5-2.778-6 .926-1 1.907 1.725 3.706 1.239 3.704-1 8.335.761 8.335.761z"/><path fill="#E75A70" d="M32.262 15c-.09 0-.174.019-.262.029V15H18.154c-1.511 0-2.734 1.343-2.734 3s1.224 3 2.734 3H32v-.029c.088.009.172.029.262.029C33.774 21 35 19.657 35 18c0-1.656-1.226-3-2.738-3z"/></svg> \ No newline at end of file |