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/1f3a4.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/1f3a4.svg')
-rw-r--r-- | public/emoji/1f3a4.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3a4.svg b/public/emoji/1f3a4.svg index 854679bc7..d3c6697c9 100644 --- a/public/emoji/1f3a4.svg +++ b/public/emoji/1f3a4.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(35.999,24.0825)" id="g20"><path id="path22" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.803 -3.082,-6.885 -6.885,-6.885 -3.802,0 -6.884,3.082 -6.884,6.885 0,3.802 3.082,6.884 6.884,6.884 C -3.082,6.884 0,3.802 0,0"/></g><g transform="translate(32.8096,17.4316)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.336,-0.336 -0.881,-0.336 -1.217,0 l -9.127,9.128 c -0.336,0.336 -0.336,0.881 0,1.217 l 1.217,1.217 c 0.336,0.336 0.881,0.336 1.217,0 L 1.217,2.434 c 0.336,-0.336 0.336,-0.881 0,-1.217 L 0,0 Z"/></g><g transform="translate(26.7393,17.2959)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.325,4.327 C -5.104,5.105 -6.32,5.06 -7.044,4.226 l -9.158,-10.575 c -1.219,-1.408 -1.462,-3.353 -0.711,-4.73 l -4.911,-4.912 1.409,-1.409 4.877,4.877 c 1.382,-0.84 3.411,-0.61 4.863,0.648 l 10.574,9.157 C 0.732,-1.994 0.779,-0.777 0,0"/></g><g transform="translate(4,30)" id="g32"><path id="path34" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-8.122 c -0.314,0.075 -0.648,0.123 -1,0.123 -1.657,0 -3,-0.896 -3,-2 0,-1.105 1.343,-2 3,-2 1.656,0 2.999,0.895 3,1.999 l 0,0 0,6.111 5,-2.222 0,-5.011 c -0.314,0.075 -0.648,0.123 -1,0.123 -1.657,0 -3,-0.896 -3,-2.001 0,-1.104 1.343,-2 3,-2 1.656,0 2.999,0.896 2.999,2 L 9,-13 9,-4 9,-4 0,0 Z"/></g><g transform="translate(18,35)" id="g36"><path id="path38" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-8.123 C -0.314,-8.048 -0.647,-8 -1,-8 c -1.657,0 -3,-0.895 -3,-2 0,-1.104 1.343,-2 3,-2 1.656,0 3,0.896 3,2 L 2,0 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M35.999 11.917c0 3.803-3.082 6.885-6.885 6.885-3.802 0-6.884-3.082-6.884-6.885 0-3.802 3.082-6.884 6.884-6.884 3.803 0 6.885 3.082 6.885 6.884z"/><path fill="#292F33" d="M32.81 18.568c-.336.336-.881.336-1.217 0L22.466 9.44c-.336-.336-.336-.881 0-1.217l1.217-1.217c.336-.336.881-.336 1.217 0l9.127 9.128c.336.336.336.881 0 1.217l-1.217 1.217zm-6.071.136l-4.325-4.327c-.778-.779-1.995-.733-2.719.101l-9.158 10.574c-1.219 1.408-1.461 3.354-.711 4.73l-4.911 4.912 1.409 1.409 4.877-4.877c1.381.84 3.411.609 4.862-.648l10.575-9.157c.834-.723.881-1.94.101-2.717z"/><path fill="#55ACEE" d="M4 6v8.122C3.686 14.047 3.352 14 3 14c-1.657 0-3 .896-3 2s1.343 2 3 2 3-.896 3-2V9.889l5 2.222v5.011c-.314-.075-.648-.122-1-.122-1.657 0-3 .896-3 2s1.343 2 3 2 2.999-.896 3-2v-9L4 6zm14-5v8.123C17.685 9.048 17.353 9 17 9c-1.657 0-3 .895-3 2 0 1.104 1.343 2 3 2 1.656 0 3-.896 3-2V1h-2z"/></svg> \ No newline at end of file |