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/1f453.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/1f453.svg')
-rw-r--r-- | public/emoji/1f453.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f453.svg b/public/emoji/1f453.svg index 0e0451ea2..d6e8759b5 100644 --- a/public/emoji/1f453.svg +++ b/public/emoji/1f453.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.998,15.0352)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.009 0.002,0.018 0.002,0.027 0,0.169 -0.022,0.329 -0.055,0.483 -0.477,3.043 -4.013,13.56 -4.945,15.424 -1,2 -3.293,1.722 -4,1.015 -1,-1 -1,-2.992 0,-2.992 1,0 3,0.043 4,-2.992 0.79,-2.399 1.689,-5.979 2.269,-8.399 -1.6,0.785 -4.157,1.18 -6.832,1.18 -2.929,0 -5.248,-0.293 -6.475,-0.958 -0.496,0.112 -1.134,0.177 -1.962,0.177 -0.828,0 -1.466,-0.065 -1.962,-0.177 -1.227,0.665 -3.546,0.958 -6.476,0.958 -2.674,0 -5.231,-0.395 -6.831,-1.18 0.58,2.42 1.479,6.001 2.269,8.399 1,3.035 3,2.992 4,2.992 1,0 1,1.992 0,2.992 -0.707,0.707 -3,0.985 -4,-1.015 -0.932,-1.864 -4.467,-12.38 -4.945,-15.424 -0.033,-0.154 -0.055,-0.313 -0.055,-0.483 0,-0.009 0.002,-0.018 0.002,-0.027 -10e-4,-0.011 -0.002,-0.025 -0.002,-0.035 l 0.004,0 c 0.022,-0.851 0.486,-1.531 1.058,-1.531 0.046,0 0.089,0.011 0.133,0.019 0.315,-2.724 1.153,-5.555 1.992,-6.394 2.125,-2.125 8.5,-2.125 10.625,0 1.304,1.303 2.502,5.302 2.973,7.775 0.38,0.073 0.786,0.131 1.215,0.131 0.429,0 0.835,-0.058 1.215,-0.131 0.472,-2.473 1.669,-6.472 2.972,-7.775 2.125,-2.125 8.5,-2.125 10.625,0 0.84,0.839 1.678,3.67 1.993,6.394 0.044,-0.008 0.088,-0.019 0.132,-0.019 0.573,0 1.037,0.68 1.059,1.531 l 0.004,0 C 0.002,-0.025 0,-0.011 0,0"/></g><g transform="translate(14.875,13.8936)" id="g24"><path id="path26" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.169 -1.105,-4.223 -2.338,-5.454 -1.557,-1.559 -6.233,-1.559 -7.791,0 -0.779,0.779 -1.559,2.692 -1.559,5.029 0,1.559 3.148,2.125 6.376,2.125 C -2.125,1.7 0,1.169 0,0"/></g><g transform="translate(21.125,13.8936)" id="g28"><path id="path30" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.169 1.105,-4.223 2.338,-5.454 1.558,-1.559 6.233,-1.559 7.791,0 0.779,0.779 1.559,2.692 1.559,5.029 C 11.688,1.134 8.54,1.7 5.312,1.7 2.125,1.7 0,1.169 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M35.686 11.931c-.507-.522-6.83-1.094-13.263-.369-1.283.144-1.363.51-4.425.63-3.061-.119-3.141-.485-4.425-.63C7.14 10.837.817 11.41.31 11.931c-.252.261-.252 2.077 0 2.338.254.261 1.035.606 1.403 1.827.237.787.495 5.864 2.281 7.377 1.768 1.498 7.462 1.217 9.326.262 2.536-1.298 2.892-5.785 3.292-7.639.203-.939 1.162-1.016 1.385-1.016s1.182.077 1.385 1.016c.401 1.853.757 6.34 3.292 7.639 1.865.955 7.558 1.236 9.326-.262 1.786-1.513 2.044-6.59 2.281-7.377.368-1.22 1.149-1.566 1.403-1.827.254-.26.254-2.077.002-2.338z"/><path fill="#55ACEE" d="M14.644 15.699c-.098 1.255-.521 4.966-1.757 6.083-1.376 1.243-6.25 1.568-7.79.044-.808-.799-1.567-4.018-1.503-6.816.038-1.679 2.274-2.02 5.462-2.02 3.148 0 5.763.468 5.588 2.709zm6.707 0c.098 1.255.521 4.966 1.757 6.083 1.376 1.243 6.25 1.568 7.79.044.808-.799 1.567-4.018 1.503-6.816-.038-1.679-2.274-2.02-5.462-2.02-3.147 0-5.763.468-5.588 2.709z"/></svg> \ No newline at end of file |