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/1f30f.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/1f30f.svg')
-rw-r--r-- | public/emoji/1f30f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f30f.svg b/public/emoji/1f30f.svg index 21b702ddb..30c0186e0 100644 --- a/public/emoji/1f30f.svg +++ b/public/emoji/1f30f.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(7.6875,34.125)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.325,-0.436 3.438,0 4.312,-0.312 5.187,-0.625 4.375,-1.062 5,-1.437 5.625,-1.812 5.812,-1.75 6.312,-1.562 c 0.5,0.187 0.875,0.889 1.25,0.625 0.375,-0.265 1.688,-0.029 2.001,-0.5 0.312,-0.472 0.75,-0.842 1.437,-0.5 0.688,0.341 3.313,0.661 4,0.236 0.688,-0.424 2.437,-0.5 3.125,-0.612 0.687,-0.111 2.437,-0.17 2.187,-0.46 C 20.062,-3.063 21,-2.875 20.5,-3.563 20,-4.25 18.062,-5.687 17.875,-5.5 c -0.188,0.188 -0.375,1.063 -1,1 -0.625,-0.062 -1.5,0.125 -1.562,-0.625 -0.063,-0.75 -1,-1.687 -0.313,-1.687 0.688,0 1.375,0.687 1.562,0 0.188,-0.688 0.063,-1.063 -0.125,-1.438 -0.187,-0.375 0.25,-0.375 -0.749,-0.625 -1,-0.25 -0.563,0.562 -1,-0.25 -0.438,-0.813 -1.438,-1.063 -1.188,-1.75 0.25,-0.688 0.438,-1.063 0.5,-1.625 0.063,-0.563 -0.625,-1.25 -1,-1.75 -0.375,-0.5 -0.812,-1 -1.375,-1.125 -0.562,-0.125 -1,-0.25 -1.312,-1.062 -0.313,-0.813 0.341,-2 -0.58,-1.875 -0.92,0.125 -1.42,0.687 -1.483,1.125 -0.062,0.437 -1,1.312 -1.063,1.562 -0.062,0.25 -1.25,1.125 -1.25,1.125 0,0 -0.75,-0.75 -0.75,-1.625 0,-0.875 0.25,-1.937 0.25,-1.937 0,0 -0.312,-0.438 -0.937,0.062 -0.625,0.5 -1.312,0.625 -1.625,1.313 -0.312,0.687 -0.687,1.874 -0.687,2.312 0,0.437 -0.751,1.375 -1.063,1.375 -0.313,0 -1.875,-0.188 -2,-0.438 -0.125,-0.25 -0.5,-0.687 -0.812,-1 -0.313,-0.312 -1.188,-1.437 -1.501,-1.25 -0.312,0.188 -1.562,0.875 -1.562,1.5 0,0.625 -0.875,0.25 -0.937,1.25 -0.063,1 -0.5,1.875 -0.625,0.938 -0.125,-0.938 -0.063,-1.25 0.312,-2.375 0.375,-1.125 0.625,-1.5 1.188,-1.75 0.562,-0.25 0.25,-0.687 1.187,-0.562 0.937,0.125 1.5,0.437 1.562,0.062 C -2,-17 -1.5,-17.705 -2.438,-18.321 -3.375,-18.937 -3.25,-19 -3.813,-19.562 c -0.562,-0.563 -1.124,-0.375 -1.124,-1.563 0,-1.187 0,-1.375 0.062,-2.375 0.063,-1 0.188,-1.937 -0.687,-2.437 -0.875,-0.5 -3.751,3 -4.001,5 -0.25,2 -1.312,8.687 -0.937,10.249 0.375,1.563 2.375,6.376 3.188,7.313 C -6.5,-2.438 -2,0.375 0,0"/></g><g transform="translate(15.9375,14.6875)" id="g36"><path id="path38" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.687 -0.5,-1.437 0,-2.125 0.5,-0.688 0.937,-0.688 1.375,-0.75 0.437,-0.063 1.688,0 0.688,0.812 C 1.062,-1.25 0.5,-1.875 0.625,-0.937 0.75,0 0,0 0,0"/></g><g transform="translate(22.9375,24.6875)" id="g40"><path id="path42" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.687 -0.5,-1.437 0,-2.125 0.5,-0.688 -1,-1.25 -0.562,-1.313 0.437,-0.062 2.312,0.188 1.312,1 -1,0.813 -0.25,0.563 -0.125,1.501 C 0.75,0 0,0 0,0"/></g><g transform="translate(18.3784,13.75)" id="g44"><path id="path46" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.437,0.826 0.934,0.812 1.434,0.437 0.5,-0.375 2,-1.062 1.188,-1.374 C 1.809,-1.25 2.049,-1.937 1.429,-1.25 0.809,-0.562 -0.497,-0.937 0,0"/></g><g transform="translate(22.3125,13.2412)" id="g48"><path id="path50" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.339,-0.175 0.875,-0.741 1.625,-0.679 0.75,0.063 0.688,-0.785 1.438,-0.767 0.75,0.017 1.437,-0.17 1.749,-0.545 0.313,-0.375 1.684,-0.938 0.905,-1 -0.78,-0.063 -1.092,0.5 -1.904,0.75 C 3,-1.991 2.938,-2.679 2.063,-2.179 1.187,-1.679 0.25,-2.401 0,-1.446 -0.25,-0.491 -0.737,0.38 0,0"/></g><g transform="translate(15.7153,8.5)" id="g52"><path id="path54" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.574,0.558 0.972,0.937 1.847,1.375 2.722,1.812 4.222,2.438 4.597,2.5 4.972,2.563 5.41,2.735 5.66,2.24 5.91,1.745 6.222,1.561 6.722,1.745 7.222,1.929 7.809,1.821 8.184,1.505 8.559,1.189 9.472,0.625 9.785,0 10.097,-0.625 10.722,-0.5 10.535,-1.25 10.347,-2 10.597,-3.188 9.91,-3.813 9.222,-4.437 8.785,-5.187 8.035,-5.562 7.285,-5.937 5.305,-5 5.305,-4.437 c 0,0.562 -0.72,1.025 -1.268,1.525 C 3.488,-2.412 3.163,-2.5 2.663,-2.875 2.163,-3.25 2.347,-3.625 1.722,-3.75 1.097,-3.875 -0.567,-5.187 -0.504,-4.187 -0.442,-3.188 0.403,-1.437 0,-0.875 -0.403,-0.312 -0.898,-0.874 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="M2.812 25.375c-.062-1-.062-1.187-.062-2.375s.562-1 1.125-1.562.438-.625 1.375-1.241.438-1.321.375-1.696-.625-.063-1.563.061-.624-.312-1.187-.562-.812-.625-1.188-1.75-.438-1.438-.312-2.375.563-.063.625.937.938.625.938 1.25 1.25 1.312 1.562 1.5 1.188-.938 1.5-1.25.688-.75.812-1 1.688-.438 2-.438 1.062.938 1.062 1.375.375 1.625.688 2.312 1 .812 1.625 1.312.938.062.938.062-.25-1.062-.25-1.938.75-1.625.75-1.625 1.188.875 1.25 1.125 1 1.125 1.062 1.562.562 1 1.483 1.125.267-1.062.579-1.875.75-.938 1.312-1.062 1-.625 1.375-1.125 1.062-1.188 1-1.75-.25-.938-.5-1.625.75-.938 1.188-1.75 0 0 1-.25.562-.25.75-.625.312-.75.125-1.438-.875 0-1.562 0S22.938 7.75 23 7s.938-.562 1.562-.625.812.812 1 1 2.125-1.25 2.625-1.938-.437-.499-.187-.789-1.5-.349-2.188-.46-2.437-.188-3.124-.612-3.312-.104-4 .237-1.125-.029-1.438-.5-1.625-.235-2-.5-.75.437-1.25.625-.688.25-1.312-.125.187-.813-.688-1.125c-.586-.209-1.288-.087-2.38-.111C3.902 5.092 0 11.087 0 18c0 3.42.971 6.605 2.627 9.327.308-.518.231-1.217.185-1.952zm14.5-1.187c.438.062 1.688 0 .688-.812s-1.562-.188-1.438-1.125-.625-.938-.625-.938c0 .688-.5 1.438 0 2.125s.938.687 1.375.75z"/><path fill="#5C913B" d="M23.688 13.75c-1-.812-.25-.562-.125-1.5s-.625-.938-.625-.938c0 .688-.5 1.438 0 2.125s-1 1.25-.562 1.312 2.312-.187 1.312-.999zm-3.88 9.75c.62.688.38 0 1.192-.312s-.688-1-1.188-1.375-.997-.389-1.434.438c-.496.937.81.561 1.43 1.249zm7.317 1.25c-.312-.375-1-.562-1.75-.545-.75.018-.688-.83-1.438-.768s-1.286-.504-1.625-.679c-.737-.38-.25.491 0 1.446s1.188.232 2.062.732.938-.188 1.75.062 1.125.812 1.904.75-.59-.623-.903-.998zM25.5 27.5c-.312-.625-1.226-1.188-1.601-1.505s-.962-.424-1.462-.24-.812 0-1.062-.495-.688-.322-1.062-.26-1.875.688-2.75 1.125-1.273.817-1.847 1.375c-.898.874-.403.312 0 .875.403.562-.442 2.312-.504 3.312s1.602-.312 2.227-.438.441-.5.941-.875.825-.463 1.374.037c.549.5 1.268.963 1.268 1.525s1.979 1.5 2.729 1.125 1.188-1.125 1.875-1.75.438-1.812.625-2.562-.439-.624-.751-1.249z"/></svg> \ No newline at end of file |