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/1f524.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/1f524.svg')
-rw-r--r-- | public/emoji/1f524.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f524.svg b/public/emoji/1f524.svg index 6f9f763f0..e3e9464c6 100644 --- a/public/emoji/1f524.svg +++ b/public/emoji/1f524.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:#3b88c3;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(7.9771,14.2793)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.425,0 2.109,1.444 2.109,2.755 2.109,4.066 1.444,5.547 0,5.547 -1.501,5.547 -2.166,4.066 -2.166,2.755 -2.166,1.444 -1.482,0 0,0 m 4.844,-0.607 c 0,-0.704 0,-1.786 -1.31,-1.786 -0.799,0 -1.121,0.436 -1.311,1.159 C 1.52,-2.07 0.665,-2.508 -0.38,-2.508 c -2.565,0 -4.521,2.186 -4.521,5.263 0,3.001 2.013,5.3 4.521,5.3 1.007,0 1.995,-0.399 2.603,-1.254 0.076,0.665 0.646,1.14 1.311,1.14 1.31,0 1.31,-1.083 1.31,-1.786 l 0,-6.762 z"/></g><g transform="translate(19.2627,14.2793)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.425,0 2.128,1.482 2.128,2.755 2.128,4.047 1.425,5.547 0,5.547 -1.463,5.547 -2.146,4.18 -2.146,2.85 -2.146,1.52 -1.501,0 0,0 m -4.882,10.829 c 0,0.912 0.57,1.52 1.367,1.52 0.798,0 1.369,-0.608 1.369,-1.52 l 0,-3.724 c 0.721,0.627 1.652,0.95 2.602,0.95 2.944,0 4.407,-2.754 4.407,-5.414 0,-2.584 -1.747,-5.149 -4.503,-5.149 -0.93,0 -1.994,0.418 -2.506,1.254 -0.171,-0.722 -0.608,-1.139 -1.369,-1.139 -0.797,0 -1.367,0.608 -1.367,1.52 l 0,11.702 z"/></g><g transform="translate(32.0869,19.2949)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.684,0 -1.292,0.532 -2.165,0.532 -1.559,0 -2.299,-1.387 -2.299,-2.793 0,-1.348 0.817,-2.755 2.299,-2.755 0.684,0 1.709,0.571 2.032,0.571 0.647,0 1.178,-0.551 1.178,-1.198 0,-1.405 -2.356,-1.88 -3.344,-1.88 -2.944,0 -4.901,2.413 -4.901,5.262 0,2.774 2.014,5.301 4.901,5.301 1.083,0 3.344,-0.399 3.344,-1.729 C 1.045,0.741 0.646,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" 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 d="M12.821 22.328c0 .703 0 1.785-1.311 1.785-.798 0-1.121-.436-1.311-1.158-.703.836-1.558 1.273-2.603 1.273-2.565 0-4.521-2.186-4.521-5.263 0-3.001 2.014-5.3 4.521-5.3 1.007 0 1.995.399 2.603 1.254.076-.665.646-1.14 1.311-1.14 1.311 0 1.311 1.083 1.311 1.786v6.763zm-4.844-.607c1.425 0 2.109-1.444 2.109-2.755s-.665-2.792-2.109-2.792c-1.501 0-2.166 1.482-2.166 2.792.001 1.31.684 2.755 2.166 2.755zm6.403-10.829c0-.912.57-1.52 1.368-1.52.798 0 1.368.608 1.368 1.52v3.723c.722-.627 1.652-.95 2.603-.95 2.944 0 4.407 2.754 4.407 5.415 0 2.584-1.747 5.148-4.503 5.148-.93 0-1.994-.418-2.507-1.254-.171.722-.608 1.139-1.368 1.139-.798 0-1.368-.607-1.368-1.52V10.892zm4.883 10.829c1.425 0 2.128-1.482 2.128-2.755 0-1.292-.703-2.792-2.128-2.792-1.463 0-2.146 1.368-2.146 2.697-.001 1.33.645 2.85 2.146 2.85zm12.824-5.016c-.684 0-1.292-.532-2.165-.532-1.559 0-2.299 1.387-2.299 2.792 0 1.349.817 2.755 2.299 2.755.684 0 1.709-.57 2.032-.57.647 0 1.178.551 1.178 1.197 0 1.405-2.355 1.881-3.344 1.881-2.944 0-4.901-2.413-4.901-5.263 0-2.773 2.015-5.3 4.901-5.3 1.083 0 3.344.399 3.344 1.729 0 .57-.399 1.311-1.045 1.311z" fill="#FFF"/></svg> \ No newline at end of file |