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/1f4ce.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/1f4ce.svg')
-rw-r--r-- | public/emoji/1f4ce.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4ce.svg b/public/emoji/1f4ce.svg index 7d2e463ec..284cf6674 100644 --- a/public/emoji/1f4ce.svg +++ b/public/emoji/1f4ce.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.3535,10.7461)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.217,2.391 -0.513,4.558 -2.057,6.102 L -18.32,22.364 c -0.391,0.391 -1.024,0.391 -1.414,10e-4 -0.391,-0.391 -0.391,-1.024 0,-1.415 L -3.471,4.687 c 1.117,-1.117 1.642,-2.716 1.479,-4.505 -0.159,-1.748 -0.957,-3.456 -2.188,-4.687 -1.23,-1.23 -2.937,-2.027 -4.685,-2.186 -1.781,-0.162 -3.39,0.362 -4.506,1.478 l -18.384,18.385 c -0.981,0.981 -1.059,2.205 -0.953,3.058 0.15,1.196 0.754,2.401 1.66,3.307 1.7,1.7 4.616,2.453 6.363,0.706 L -9.835,5.395 C -8.716,4.274 -9.809,2.592 -10.543,1.858 -11.276,1.123 -12.96,0.032 -14.078,1.151 l -11.314,11.314 c -0.39,0.391 -1.024,0.391 -1.414,0 -0.391,-0.39 -0.39,-1.023 0,-1.414 l 11.314,-11.314 c 1.859,-1.858 4.608,-1.049 6.363,0.707 1.758,1.757 2.566,4.507 0.708,6.365 L -23.27,21.657 c -2.621,2.62 -6.813,1.674 -9.192,-0.706 -1.215,-1.214 -2.027,-2.845 -2.231,-4.472 -0.229,-1.833 0.313,-3.51 1.524,-4.721 l 18.384,-18.385 c 1.365,-1.365 3.218,-2.094 5.281,-2.094 0.27,0 0.544,0.013 0.82,0.037 2.207,0.202 4.363,1.209 5.918,2.765 C -1.209,-4.363 -0.201,-2.206 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M35.354 25.254c.217-2.391-.513-4.558-2.057-6.102L17.033 2.89c-.391-.391-1.024-.391-1.414 0-.391.391-.391 1.024 0 1.414l16.264 16.263c1.116 1.117 1.642 2.717 1.479 4.506-.159 1.748-.957 3.456-2.188 4.686-1.23 1.23-2.938 2.027-4.685 2.187-1.781.161-3.39-.362-4.506-1.479L3.598 12.082c-.98-.98-1.059-2.204-.953-3.058.15-1.196.755-2.401 1.66-3.307 1.7-1.7 4.616-2.453 6.364-.707l14.85 14.849c1.119 1.12.026 2.803-.708 3.536-.733.735-2.417 1.826-3.535.707L9.962 12.789c-.391-.391-1.024-.39-1.414 0-.391.391-.391 1.023 0 1.414l11.313 11.314c1.859 1.858 4.608 1.05 6.363-.707 1.758-1.757 2.565-4.507.708-6.364L12.083 3.597c-2.62-2.62-6.812-1.673-9.192.706C1.677 5.517.864 7.147.661 8.775c-.229 1.833.312 3.509 1.523 4.721l18.384 18.385c1.365 1.365 3.218 2.094 5.281 2.094.27 0 .544-.013.82-.037 2.206-.201 4.362-1.209 5.918-2.765 1.558-1.556 2.565-3.713 2.767-5.919z"/></svg> \ No newline at end of file |