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/1f30d.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/1f30d.svg')
-rw-r--r-- | public/emoji/1f30d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f30d.svg b/public/emoji/1f30d.svg index d34b7012d..f81361082 100644 --- a/public/emoji/1f30d.svg +++ b/public/emoji/1f30d.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 18,36 C 8.059,36 0,27.941 0,18 l 0,0 C 0,8.059 8.059,0 18,0 l 0,0 c 9.941,0 18,8.059 18,18 l 0,0 c 0,9.941 -8.059,18 -18,18 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,18)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(27.9375,34.4375)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.305,0.943 -3.375,-1.937 -5.25,-1.375 -1.875,0.563 -4.375,1.812 -6,0.25 -1.625,-1.563 -2,-3 0,-2.937 2,0.062 3.375,2.437 4.375,1.437 1,-1 0.75,-1.812 -1.625,-2.125 -2.375,-0.312 -4.938,-0.687 -6.313,-0.687 -1.374,0 -1.687,-0.813 -0.75,-1.688 0.938,-0.875 -0.562,-0.938 -2.124,-1.813 -1.563,-0.875 0.375,-1.25 1.687,-2 1.312,-0.75 2.312,0.188 2.875,1.438 0.562,1.25 2.98,2.75 3.99,2.563 1.01,-0.188 1.01,-0.688 0.822,-1.563 -0.187,-0.875 0.751,-0.625 0.813,0.375 0.063,1 1.188,1.75 2.063,1.813 0.875,0.062 1.624,-1.188 0.625,-1.813 -1,-0.625 -2,-1.125 -0.75,-1.438 1.25,-0.312 2.124,-1.937 0.687,-2.625 -1.437,-0.687 -3.938,-1.125 -5.063,-0.562 -1.125,0.562 -3.687,1.375 -4.375,0.937 -0.687,-0.437 -1.062,-0.889 -1.874,-1.194 -0.813,-0.306 -4.125,-1.806 -4.188,-3.743 -0.062,-1.937 -0.125,-4.125 1.188,-4.187 1.312,-0.063 4.499,0.812 5.499,1.625 1,0.812 2.375,0.625 2.813,-0.313 0.437,-0.937 0.125,-1.5 -0.313,-3 -0.437,-1.5 0.287,-2.25 0.987,-3.562 0.701,-1.313 1.263,-2.063 1.263,-3 0,-0.938 1.001,-1.875 2.501,-0.313 1.5,1.563 2.874,4.625 3.499,5.75 0.625,1.125 1.126,3.625 1.876,4.125 0.75,0.5 1.937,1.688 1.062,1.5 -0.875,-0.187 -2.625,0.063 -3.063,1.313 -0.437,1.249 -2.312,3.624 -1.437,3.874 0.875,0.25 1.875,-1.389 2.25,-2.163 0.375,-0.774 0.875,-1.711 1.625,-1.961 0.75,-0.25 2.375,1.672 2.875,1.961 0.5,0.288 0.125,1.476 -0.875,1.351 -1,-0.125 -2.312,0 -2.312,0.625 0,0.625 1.249,1.437 2.249,1.25 1.001,-0.188 1.751,-0.5 2.376,-1.25 0.624,-0.75 1.874,-2.125 2.374,-3 0.5,-0.875 0.875,-1 1.125,0.562 0.25,1.563 0.625,2.063 0.876,3.25 C 8.313,-11.125 5.5,-2.25 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#88C9F9" cx="18" cy="18" r="18"/><path fill="#5C913B" d="M25.716 1.756c-1.022.568-1.872 1.528-3.028 1.181-1.875-.562-4.375-1.812-6-.25s-2 3 0 2.938 3.375-2.438 4.375-1.438.749 1.813-1.625 2.125S14.5 7 13.125 7s-1.688.812-.75 1.688-.563.937-2.125 1.812.375 1.25 1.688 2 2.312-.188 2.875-1.438 2.981-2.75 3.99-2.562c1.01.188 1.01.688.822 1.562s.75.625.812-.375 1.188-1.75 2.062-1.812 1.625 1.188.625 1.812-2 1.125-.75 1.438 2.125 1.938.688 2.625-3.937 1.125-5.062.562-3.688-1.375-4.375-.938-1.062.89-1.875 1.195c-.812.305-4.125 1.805-4.188 3.743S7.438 22.438 8.75 22.5s4.5-.812 5.5-1.625 2.375-.625 2.812.312.125 1.5-.312 3 .286 2.25.987 3.562c.701 1.312 1.263 2.062 1.263 3s1 1.875 2.5.312 2.875-4.625 3.5-5.75 1.125-3.625 1.875-4.125 1.938-1.688 1.062-1.5-2.625-.062-3.062-1.312-2.312-3.625-1.438-3.875 1.875 1.39 2.25 2.164c.375.774.875 1.711 1.625 1.961s2.375-1.673 2.875-1.961c.5-.289.125-1.476-.875-1.351s-2.312 0-2.312-.624 1.25-1.438 2.25-1.25 1.75.5 2.375 1.25 1.875 2.125 2.375 3 .875 1 1.125-.562c.166-1.038.387-1.609.59-2.222-1.013-5.829-4.82-10.683-9.999-13.148z"/></svg> \ No newline at end of file |