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/262e.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/262e.svg')
-rw-r--r-- | public/emoji/262e.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/262e.svg b/public/emoji/262e.svg index 7ff833d39..a0be08a3a 100644 --- a/public/emoji/262e.svg +++ b/public/emoji/262e.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:#9266cc;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(16.4534,28.9828)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-9.889 -7.764,-7.124 c -1.129,1.739 -1.793,3.807 -1.793,6.03 0,5.597 4.166,10.226 9.557,10.983 m 3,-13.961 5.848,-5.366 C 7.239,-20.737 5.224,-21.687 3,-21.98 l 0,8.019 z m -3,-8.005 c -2.209,0.31 -4.207,1.269 -5.802,2.682 L 0,-13.961 0,-21.966 Z m 12.65,10.983 c 0,-2.246 -0.675,-4.335 -1.827,-6.085 L 3,-9.889 3,0.014 c 5.436,-0.715 9.65,-5.368 9.65,-10.997 m -11.103,14 c -7.72,0 -14,-6.28 -14,-14 0,-7.719 6.28,-14 14,-14 7.719,0 14,6.281 14,14 0,7.72 -6.281,14 -14,14"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" 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 fill="#FFF" d="M18 4C10.281 4 4 10.281 4 18s6.281 14 14 14 14-6.281 14-14S25.719 4 18 4zm11.103 14c0 2.246-.675 4.335-1.827 6.085l-7.823-7.178V7.003c5.437.716 9.65 5.368 9.65 10.997zm-12.65 10.983c-2.209-.31-4.207-1.268-5.802-2.682l5.802-5.323v8.005zm3-8.005l5.848 5.366c-1.609 1.41-3.624 2.36-5.848 2.653v-8.019zm-3-13.961v9.889L8.69 24.03C7.56 22.291 6.897 20.223 6.897 18c0-5.596 4.165-10.226 9.556-10.983z"/></svg> \ No newline at end of file |