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/1f3c8.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/1f3c8.svg')
-rw-r--r-- | public/emoji/1f3c8.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3c8.svg b/public/emoji/1f3c8.svg index 3a7e9ea5c..4f5530d29 100644 --- a/public/emoji/1f3c8.svg +++ b/public/emoji/1f3c8.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(7.7539,28.2461)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.686,-3.686 -6.114,-8.616 -6.911,-13.581 L 6.911,-27.403 c 4.965,0.797 9.895,3.225 13.581,6.911 3.686,3.686 6.114,8.616 6.911,13.581 L 13.581,6.911 C 8.616,6.114 3.686,3.686 0,0"/></g><g transform="translate(33.3691,33.3691)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.662,1.479 -5.735,2.121 -8.897,2.067 L 2.067,-8.898 C 2.121,-5.736 1.479,-2.662 0,0"/></g><g transform="translate(2.6309,2.6309)" id="g28"><path id="path30" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.662,-1.479 5.736,-2.121 8.898,-2.067 L -2.067,8.897 C -2.121,5.736 -1.479,2.662 0,0"/></g><g transform="translate(22.8282,24.2427)" id="g32"><path id="path34" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.414,-2.414 -0.707,0.707 c -0.391,0.391 -1.024,0.391 -1.414,0 -0.391,-0.391 -0.391,-1.024 0,-1.415 l 0.707,-0.706 -3.415,-3.415 -0.706,0.707 c -0.391,0.391 -1.024,0.391 -1.415,0 -0.391,-0.39 -0.391,-1.023 0,-1.414 l 0.707,-0.707 -2.414,-2.414 -0.707,0.707 c -0.391,0.391 -1.023,0.391 -1.414,0 -0.391,-0.39 -0.391,-1.024 0,-1.414 l 0.707,-0.707 -1,-1 c -0.391,-0.392 -0.391,-1.024 0,-1.415 0.391,-0.391 1.023,-0.391 1.414,0 l 1,1 0.707,-0.707 c 0.391,-0.391 1.024,-0.391 1.415,0 0.39,0.392 0.39,1.023 0,1.414 l -0.707,0.707 2.414,2.415 0.707,-0.707 c 0.39,-0.392 1.023,-0.392 1.414,0 0.391,0.391 0.391,1.024 0,1.414 l -0.707,0.707 3.414,3.414 0.707,-0.707 c 0.391,-0.39 1.024,-0.39 1.414,0 0.391,0.391 0.392,1.024 0,1.414 L -1,-3.829 1.415,-1.414 2.122,-2.122 c 0.391,-0.39 1.023,-0.39 1.414,0 0.391,0.391 0.391,1.024 0,1.415 L 2.829,0 l 1,1 c 0.39,0.391 0.39,1.023 0,1.414 -0.391,0.391 -1.024,0.391 -1.415,0 l -1,-1 -0.707,0.707 c -0.39,0.391 -1.023,0.391 -1.414,0 -0.391,-0.39 -0.391,-1.023 0,-1.414 L 0,0 Z"/></g><g transform="translate(0.5639,11.5284)" id="g36"><path id="path38" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 10.965,-10.965 c 1.04,0.018 2.087,0.111 3.136,0.279 L 0.279,3.137 C 0.111,2.088 0.018,1.04 0,0"/></g><g transform="translate(24.4716,35.4361)" id="g40"><path id="path42" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.04,-0.018 -2.088,-0.111 -3.137,-0.279 l 13.823,-13.822 c 0.168,1.049 0.261,2.096 0.279,3.137 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M7.754 7.754C4.068 11.44 1.64 16.37.843 21.335l13.822 13.822c4.965-.797 9.895-3.225 13.581-6.911s6.114-8.616 6.911-13.581L21.335.843C16.37 1.64 11.44 4.068 7.754 7.754zm25.615-5.123C30.707 1.152 27.634.51 24.472.564l10.965 10.964c.053-3.162-.589-6.235-2.068-8.897zM2.631 33.369c2.662 1.479 5.736 2.121 8.898 2.067L.564 24.472c-.054 3.161.588 6.235 2.067 8.897z"/><path fill="#E1E8ED" d="M22.828 11.757l-2.414 2.414-.707-.707c-.391-.391-1.023-.391-1.414 0s-.391 1.024 0 1.414l.707.708L15.586 19l-.707-.707c-.391-.391-1.023-.391-1.414 0s-.391 1.023 0 1.414l.707.707-2.414 2.414-.707-.707c-.391-.391-1.023-.391-1.414 0s-.391 1.024 0 1.414l.707.707-1 1c-.391.392-.391 1.024 0 1.415s1.023.391 1.414 0l1-1 .707.707c.391.391 1.023.391 1.414 0 .391-.392.391-1.024 0-1.414l-.707-.707 2.414-2.414.707.707c.391.392 1.023.392 1.414 0 .391-.391.391-1.024 0-1.414L17 20.414 20.414 17l.707.707c.391.391 1.024.391 1.414 0 .391-.391.392-1.023 0-1.414l-.707-.707 2.414-2.414.707.707c.391.391 1.023.39 1.414 0 .391-.391.391-1.023 0-1.414l-.707-.707 1-1c.39-.391.39-1.023 0-1.414-.391-.391-1.024-.391-1.415 0l-1 1-.707-.707c-.39-.391-1.024-.391-1.414 0-.391.39-.391 1.023 0 1.414l.708.706zM.564 24.472l10.965 10.965c1.04-.018 2.088-.111 3.136-.279L.843 21.335c-.168 1.049-.261 2.096-.279 3.137zM24.472.564c-1.04.018-2.088.111-3.136.279l13.822 13.822c.168-1.049.261-2.096.279-3.136L24.472.564z"/></svg> \ No newline at end of file |