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/2653.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/2653.svg')
-rw-r--r-- | public/emoji/2653.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2653.svg b/public/emoji/2653.svg index c529897f8..854032a87 100644 --- a/public/emoji/2653.svg +++ b/public/emoji/2653.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(30.5,17.5)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.829 -0.672,1.5 -1.5,1.5 l -3.472,0 c 0.291,6.296 3.25,8.705 3.371,8.8 0.663,0.497 0.797,1.437 0.3,2.1 -0.497,0.663 -1.436,0.796 -2.1,0.3 -0.18,-0.135 -4.243,-3.296 -4.568,-11.2 l -9.064,0 c -0.326,7.904 -4.388,11.065 -4.569,11.2 -0.657,0.494 -1.583,0.362 -2.083,-0.292 -0.5,-0.652 -0.376,-1.591 0.271,-2.098 0.132,-0.104 3.093,-2.514 3.384,-8.81 l -3.47,0 C -24.329,1.5 -25,0.829 -25,0 c 0,-0.828 0.671,-1.5 1.5,-1.5 l 3.398,0 c -0.536,-5.524 -3.162,-7.691 -3.31,-7.809 -0.653,-0.499 -0.784,-1.432 -0.29,-2.091 0.295,-0.393 0.745,-0.6 1.202,-0.6 0.313,0 0.628,0.098 0.898,0.3 0.173,0.129 3.9,3.028 4.509,10.2 l 9.185,0 c 0.607,-7.172 4.335,-10.071 4.507,-10.2 0.268,-0.201 0.582,-0.298 0.891,-0.298 0.451,0 0.896,0.204 1.193,0.59 0.5,0.652 0.376,1.591 -0.271,2.098 -0.125,0.099 -2.773,2.26 -3.311,7.81 l 3.399,0 C -0.672,-1.5 0,-0.828 0,0"/></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="M30.5 18.5c0-.829-.672-1.5-1.5-1.5h-3.472c.291-6.296 3.25-8.705 3.371-8.8.662-.497.797-1.438.3-2.1-.497-.663-1.437-.796-2.101-.3-.18.135-4.242 3.296-4.567 11.2h-9.064C13.141 9.096 9.079 5.935 8.898 5.8c-.657-.494-1.583-.362-2.083.292-.5.652-.376 1.59.271 2.098.132.104 3.093 2.514 3.384 8.81H7c-.829 0-1.5.671-1.5 1.5 0 .828.671 1.5 1.5 1.5h3.398c-.535 5.524-3.161 7.691-3.31 7.809-.653.499-.784 1.433-.29 2.092.295.392.745.599 1.202.599.313 0 .629-.098.899-.3.173-.129 3.9-3.028 4.508-10.2h9.185c.607 7.172 4.335 10.071 4.507 10.2.269.201.582.298.892.298.451 0 .896-.204 1.192-.59.5-.652.376-1.591-.271-2.099-.125-.099-2.773-2.26-3.312-7.81H29c.828.001 1.5-.671 1.5-1.499z"/></svg> \ No newline at end of file |