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/1f520.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/1f520.svg')
-rw-r--r-- | public/emoji/1f520.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f520.svg b/public/emoji/1f520.svg index 6771c2328..429f11364 100644 --- a/public/emoji/1f520.svg +++ b/public/emoji/1f520.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(36,4)" id="g20"><path id="path22" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(8.2134,24.2812)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.609,0 1.843,5.509 1.805,5.509 0,0 Z m -0.209,6.896 c 0.323,0.874 1.064,1.577 2.033,1.577 1.007,0 1.71,-0.665 2.032,-1.577 L 7.58,-3.438 c 0.114,-0.305 0.152,-0.57 0.152,-0.704 0,-0.74 -0.608,-1.253 -1.311,-1.253 -0.797,0 -1.197,0.417 -1.387,0.988 l -0.57,1.785 -5.281,0 -0.57,-1.766 c -0.19,-0.59 -0.589,-1.007 -1.367,-1.007 -0.76,0 -1.406,0.57 -1.406,1.33 0,0.303 0.095,0.531 0.133,0.627 l 3.818,10.334 z"/></g><g transform="translate(11.0537,16.7539)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.387,0 4.085,-0.456 4.085,-2.127 4.085,-2.812 3.609,-3.4 2.907,-3.4 2.128,-3.4 1.596,-2.735 0,-2.735 c -2.355,0 -3.571,-1.995 -3.571,-4.313 0,-2.261 1.235,-4.198 3.571,-4.198 1.596,0 2.242,0.798 3.021,0.798 0.855,0 1.253,-0.856 1.253,-1.292 0,-1.824 -2.868,-2.241 -4.274,-2.241 -3.856,0 -6.535,3.058 -6.535,6.99 C -6.535,-3.039 -3.875,0 0,0"/></g><g transform="translate(23.252,21.5078)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2.241,0 c 1.027,0 1.786,0.589 1.786,1.652 0,0.893 -0.684,1.501 -2.013,1.501 L 0,3.153 0,0 Z m 0,5.661 1.48,0 c 0.932,0 1.54,0.551 1.54,1.501 0,0.893 -0.704,1.349 -1.54,1.349 l -1.48,0 0,-2.85 z m -2.85,3.932 c 0,0.912 0.627,1.425 1.5,1.425 l 3.648,0 c 1.975,0 3.571,-1.33 3.571,-3.343 0,-1.33 -0.551,-2.223 -1.766,-2.793 l 0,-0.038 C 5.718,4.616 6.99,3.268 6.99,1.615 6.99,-1.064 5.205,-2.508 2.583,-2.508 l -3.913,0 c -0.874,0 -1.52,0.551 -1.52,1.444 l 0,10.657 z"/></g><g transform="translate(22.748,5.6221)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.918,0 C 4.369,0 5.49,1.805 5.49,4.084 5.49,6.516 4.35,8.282 1.729,8.282 L 0,8.282 0,0 Z m -2.85,9.44 c 0,0.875 0.608,1.463 1.463,1.463 l 3.154,0 c 4.254,0 6.686,-2.735 6.686,-6.952 0,-3.989 -2.583,-6.573 -6.496,-6.573 l -3.307,0 c -0.627,0 -1.5,0.342 -1.5,1.425 l 0,10.637 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path d="M8.004 4.823c.323-.874 1.064-1.577 2.033-1.577 1.007 0 1.71.665 2.033 1.577l3.724 10.334c.114.304.152.57.152.703 0 .741-.608 1.253-1.311 1.253-.798 0-1.197-.417-1.387-.988l-.57-1.786H7.396l-.57 1.767c-.19.589-.589 1.007-1.368 1.007-.76 0-1.406-.57-1.406-1.33 0-.304.095-.532.133-.627L8.004 4.823zm.209 6.896h3.609L10.055 6.21h-.038l-1.804 5.509zm2.841 7.527c1.387 0 4.084.456 4.084 2.127 0 .685-.475 1.274-1.178 1.274-.779 0-1.311-.665-2.907-.665-2.355 0-3.571 1.995-3.571 4.312 0 2.261 1.235 4.198 3.571 4.198 1.596 0 2.242-.798 3.02-.798.855 0 1.254.856 1.254 1.292 0 1.823-2.869 2.241-4.274 2.241-3.856 0-6.535-3.059-6.535-6.99.001-3.952 2.66-6.991 6.536-6.991zm9.348-14.347c0-.912.627-1.425 1.5-1.425h3.648c1.976 0 3.571 1.33 3.571 3.343 0 1.33-.551 2.223-1.767 2.792v.038c1.615.228 2.888 1.577 2.888 3.229 0 2.679-1.785 4.123-4.407 4.123h-3.913c-.874 0-1.52-.551-1.52-1.444V4.899zm2.85 3.932h1.48c.932 0 1.539-.551 1.539-1.5 0-.893-.703-1.349-1.539-1.349h-1.48v2.849zm0 5.661h2.241c1.026 0 1.786-.589 1.786-1.652 0-.893-.685-1.501-2.014-1.501h-2.014v3.153zm-3.354 6.446c0-.875.608-1.463 1.463-1.463h3.153c4.255 0 6.687 2.735 6.687 6.952 0 3.989-2.583 6.573-6.496 6.573h-3.307c-.627 0-1.5-.342-1.5-1.425V20.938zm2.85 9.44h1.918c2.451 0 3.572-1.805 3.572-4.084 0-2.432-1.141-4.198-3.762-4.198h-1.729v8.282z" fill="#FFF"/></svg> \ No newline at end of file |