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/1f63b.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/1f63b.svg')
-rw-r--r-- | public/emoji/1f63b.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f63b.svg b/public/emoji/1f63b.svg index 7fbf39f0b..0255ef366 100644 --- a/public/emoji/1f63b.svg +++ b/public/emoji/1f63b.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,16)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-10 -11,-16 -18,-16 -7,0 -18,6.059 -18,16 0,9.941 4,20 18,20 C -4,20 0,10 0,0"/></g><g transform="translate(35,35)" id="g24"><path id="path26" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,-1 0,-11 0,-11 l -8,10 c 0,0 7,2 8,1"/></g><g transform="translate(1,35)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1,-1 0,-11 0,-11 L 8,-1 C 8,-1 1,1 0,0"/></g><g transform="translate(31.4043,12.2949)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.123,0.169 -0.338,0.245 -0.542,0.186 -0.069,-0.02 -7,-1.981 -12.863,-1.981 -5.858,0 -12.793,1.961 -12.862,1.981 -0.209,0.062 -0.431,-0.022 -0.552,-0.201 -0.12,-0.179 -0.113,-0.416 0.02,-0.587 0.292,-0.376 7.221,-9.193 13.394,-9.193 7.185,0 13.166,8.846 13.417,9.223 C 0.128,-0.397 0.123,-0.17 0,0"/></g><g transform="translate(7.9995,11)" id="g36"><path id="path38" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 5,-2 10,-2 5,0 10,2 10,2 0,0 0,-3 -1,-3 -1,0 -2,1 -2,1 0,0 -4,-2 -7,-2 C 7,-4 3,-2 3,-2 3,-2 2,-3 1,-3 0,-3 0,0 0,0"/></g><g transform="translate(17.9995,16.5)" id="g40"><path id="path42" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.001,0 3.001,-0.5 3.001,-1.5 0,-1 -1.5,-3 -3.001,-3 -1.5,0 -3,2 -3,3 0,1 -10e-4,1.5 3,1.5"/></g><g transform="translate(26,15.5)" id="g44"><path id="path46" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.209,0 -0.404,0.133 -0.475,0.342 -0.086,0.262 0.055,0.545 0.317,0.633 l 9,2.999 C 9.105,4.062 9.387,3.92 9.475,3.658 9.562,3.396 9.42,3.113 9.158,3.026 l -9,-3.001 C 0.105,0.008 0.053,0 0,0"/></g><g transform="translate(24.999,13.5)" id="g48"><path id="path50" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.233,0 -0.441,0.164 -0.489,0.402 -0.055,0.271 0.121,0.534 0.392,0.588 l 10,2 C 10.163,3.044 10.436,2.87 10.491,2.598 10.546,2.327 10.37,2.064 10.099,2.01 l -10,-2 C 0.066,0.003 0.033,0 0,0"/></g><g transform="translate(10,15.5)" id="g52"><path id="path54" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.052,0 -0.105,0.008 -0.158,0.025 l -9,3.001 c -0.262,0.087 -0.404,0.37 -0.316,0.632 0.087,0.262 0.368,0.404 0.632,0.316 l 9,-2.999 C 0.42,0.887 0.561,0.604 0.474,0.342 0.404,0.133 0.21,0 0,0"/></g><g transform="translate(11.0005,13.5)" id="g56"><path id="path58" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.032,0 -0.065,0.003 -0.099,0.01 l -10,2 c -0.27,0.054 -0.446,0.317 -0.392,0.588 0.054,0.271 0.313,0.449 0.589,0.392 l 10,-2 C 0.368,0.936 0.544,0.673 0.49,0.402 0.442,0.164 0.233,0 0,0"/></g><g transform="translate(16.2261,30.8828)" id="g60"><path id="path62" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.859,2.431 -3.525,3.708 -5.956,2.85 -1.477,-0.52 -2.521,-1.711 -2.928,-3.104 -1.192,0.829 -2.752,1.1 -4.225,0.58 -2.431,-0.857 -3.708,-3.525 -2.85,-5.956 0.123,-0.345 0.284,-0.663 0.473,-0.958 1.951,-3.582 7.588,-6.1 11.002,-6.131 2.636,2.167 5.445,7.664 4.716,11.677 C 0.194,-0.693 0.119,-0.344 0,0"/></g><g transform="translate(19.7744,30.8828)" id="g64"><path id="path66" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.859,2.431 3.525,3.708 5.956,2.85 1.477,-0.52 2.521,-1.711 2.929,-3.104 1.191,0.829 2.751,1.1 4.224,0.58 2.43,-0.857 3.707,-3.525 2.85,-5.956 -0.123,-0.345 -0.284,-0.663 -0.473,-0.958 -1.951,-3.582 -7.588,-6.1 -11.002,-6.131 -2.636,2.167 -5.445,7.664 -4.716,11.677 C -0.194,-0.693 -0.119,-0.344 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 20c0 10-11 16-18 16S0 29.941 0 20C0 10.059 4 0 18 0s18 10 18 20z"/><path fill="#FFCC4D" d="M35 1c1 1 0 11 0 11L27 2s7-2 8-1zM1 1C0 2 1 12 1 12L9 2S2 0 1 1z"/><path fill="#292F33" d="M31.404 23.705c-.123-.169-.338-.245-.542-.186-.069.02-7 1.98-12.863 1.98-5.858 0-12.793-1.961-12.862-1.98-.209-.062-.431.021-.552.2-.121.18-.113.416.02.587.292.377 7.221 9.194 13.395 9.194 7.185 0 13.166-8.846 13.417-9.223.115-.174.11-.402-.013-.572z"/><path fill="#F5F8FA" d="M8 25s5 2 10 2 10-2 10-2 0 3-1 3-2-1-2-1-4 2-7 2-7-2-7-2-1 1-2 1-1-3-1-3z"/><path fill="#67757F" d="M18 19.5c3 0 3 .5 3 1.5s-1.5 3-3 3-3-2-3-3-.001-1.5 3-1.5z"/><path d="M26 20.5c-.209 0-.404-.133-.475-.342-.087-.262.055-.545.316-.633l9-3c.264-.087.545.054.633.316.087.262-.055.545-.316.632l-9 3c-.053.019-.105.027-.158.027zm-1.001 2c-.233 0-.441-.164-.489-.402-.055-.271.121-.534.392-.588l10-2c.26-.054.533.12.588.392.055.271-.121.534-.393.588l-10 2c-.032.007-.065.01-.098.01zM10 20.5c-.052 0-.106-.008-.158-.025l-9-3c-.262-.087-.403-.37-.316-.632.087-.262.368-.404.632-.316l9 3c.262.088.403.371.316.633-.07.207-.264.34-.474.34zm1 2c-.032 0-.065-.003-.099-.01l-10-2c-.271-.054-.446-.317-.392-.588.054-.271.313-.449.588-.392l10 2c.271.054.446.317.392.588-.046.238-.255.402-.489.402z" fill="#9AAAB4"/><path fill="#E75A70" d="M16.226 5.117c-.859-2.431-3.525-3.707-5.956-2.85-1.477.52-2.521 1.711-2.928 3.104-1.191-.829-2.751-1.1-4.225-.58-2.431.857-3.708 3.525-2.85 5.956.122.345.284.663.472.958 1.951 3.582 7.588 6.1 11.002 6.131 2.637-2.167 5.445-7.664 4.717-11.677-.038-.348-.113-.698-.232-1.042zm3.548 0c.859-2.431 3.525-3.707 5.956-2.85 1.477.52 2.521 1.711 2.929 3.104 1.191-.829 2.751-1.1 4.225-.58 2.43.857 3.707 3.525 2.85 5.956-.123.345-.284.663-.473.958-1.951 3.582-7.588 6.1-11.002 6.131-2.637-2.167-5.445-7.664-4.717-11.677.038-.348.113-.698.232-1.042z"/></svg> \ No newline at end of file |