about summary refs log tree commit diff
path: root/public/emoji/1f4b8.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-09 07:05:29 +0200
committerThibaut Girka <thib@sitedethib.com>2018-07-09 07:13:59 +0200
commitd392020da6ff4511a2925b327de23933f374bea3 (patch)
treee86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f4b8.svg
parentc699b2d141d7aa910bd81ae5fe881ecec7039395 (diff)
parent1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (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/1f4b8.svg')
-rw-r--r--public/emoji/1f4b8.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4b8.svg b/public/emoji/1f4b8.svg
index f51e8fbb3..d2d63ceb9 100644
--- a/public/emoji/1f4b8.svg
+++ b/public/emoji/1f4b8.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><clipPath id="clipPath36" clipPathUnits="userSpaceOnUse"><path id="path38" d="m 21.864,14.949 c -0.052,-0.031 -0.459,-0.336 -0.528,-0.405 l 0,0 c -0.01,-0.008 -0.016,-0.02 -0.023,-0.027 l 0,0 c -0.011,-0.011 -0.025,-0.02 -0.036,-0.031 l 0,0 0.006,-0.005 c -1,-1.062 -1.012,-2.704 -0.006,-3.713 l 0,0 c 1.008,-1.007 2.65,-0.994 3.713,0.007 l 0,0 0.01,-0.012 c -0.02,-0.019 -0.043,-0.032 -0.063,-0.052 l 0,0 C 23.878,9.652 23.853,7.962 24.879,6.935 l 0,0 c 1.026,-1.026 2.716,-1 3.775,0.058 l 0,0 c 0.02,0.021 0.033,0.043 0.053,0.065 l 0,0 0.01,-0.012 C 27.716,5.984 27.705,4.342 28.713,3.334 l 0,0 c 1.006,-1.007 2.648,-0.995 3.71,0.006 l 0,0 0.007,-0.006 c 0.01,0.01 0.019,0.025 0.029,0.036 l 0,0 c 0.009,0.008 0.019,0.014 0.028,0.023 l 0,0 c 0.07,0.067 0.123,0.145 0.181,0.22 l 0,0 c 0.042,0.052 0.088,0.101 0.128,0.155 l 0,0 c 0.036,0.05 0.066,0.101 0.096,0.153 l 0,0 c 1.421,2.186 0.49,5.894 -2.322,8.707 l 0,0 c -1.934,1.934 -4.294,2.978 -6.29,2.978 l 0,0 c -0.905,10e-4 -1.734,-0.214 -2.416,-0.657"/></clipPath><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath72" clipPathUnits="userSpaceOnUse"><path id="path74" d="M 3.36,35.08 C 3.308,35.05 3.257,35.02 3.207,34.985 l 0,0 C 3.154,34.945 3.103,34.899 3.052,34.857 l 0,0 C 2.978,34.797 2.901,34.745 2.831,34.676 l 0,0 C 2.822,34.667 2.817,34.656 2.809,34.647 l 0,0 C 2.798,34.637 2.785,34.628 2.774,34.618 l 0,0 0.005,-0.006 C 1.778,33.55 1.767,31.907 2.774,30.901 l 0,0 c 1.007,-1.008 2.649,-0.995 3.711,0.005 l 0,0 0.011,-0.012 C 6.476,30.875 6.453,30.862 6.433,30.842 l 0,0 C 5.374,29.783 5.349,28.094 6.375,27.067 l 0,0 c 1.026,-1.026 2.716,-1 3.775,0.058 l 0,0 c 0.02,0.02 0.034,0.043 0.052,0.064 l 0,0 0.011,-0.012 c -1,-1.062 -1.012,-2.704 -0.004,-3.711 l 0,0 c 1.006,-1.007 2.649,-0.996 3.711,0.005 l 0,0 0.006,-0.005 c 0.01,0.011 0.019,0.024 0.029,0.036 l 0,0 c 0.009,0.007 0.019,0.013 0.028,0.022 l 0,0 c 0.07,0.069 0.122,0.146 0.181,0.22 l 0,0 c 0.043,0.052 0.089,0.102 0.128,0.156 l 0,0 c 0.036,0.049 0.065,0.1 0.096,0.152 l 0,0 c 1.421,2.187 0.49,5.895 -2.321,8.707 l 0,0 c -1.934,1.935 -4.294,2.979 -6.29,2.979 l 0,0 c -0.905,0 -1.735,-0.215 -2.417,-0.658"/></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(11.4761,25.7642)" id="g20"><path id="path22" style="fill:#a7d28b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.783,-5.25 -10.408,-7.737 -10.408,-7.737 -1.236,-1.047 -0.192,-2.281 -0.192,-2.281 l 10.439,-12.359 c 0,0 0.522,-0.618 2.28,-0.19 0,0 6.625,2.482 10.407,7.732 3.899,5.411 10.929,7.119 10.929,7.119 1.236,1.046 0.193,2.282 0.193,2.282 L 13.209,6.923 c 0,0 -0.522,0.618 -2.28,0.193 C 10.929,7.116 3.899,5.412 0,0"/></g><g transform="translate(14.2793,28.7124)" id="g24"><path id="path26" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.009,-0.831 -1.978,-1.802 -2.803,-2.948 -3.619,-4.081 -4.571,-5.077 -5.557,-5.955 L 6.97,-20.791 c 0.985,0.879 1.937,1.876 2.753,3.008 0.825,1.145 1.794,2.116 2.802,2.948 L 0,0 Z"/></g><g transform="translate(32.4561,3.4121)" id="g28"><path id="path30" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.009,0.008 0.019,0.014 0.028,0.021 0.069,0.069 0.121,0.147 0.181,0.221 0.042,0.052 0.089,0.102 0.128,0.155 0.035,0.05 0.064,0.101 0.096,0.153 1.42,2.186 0.49,5.895 -2.322,8.707 -2.811,2.811 -6.52,3.742 -8.707,2.321 -0.052,-0.031 -0.102,-0.06 -0.153,-0.096 -0.053,-0.039 -0.104,-0.086 -0.154,-0.127 -0.075,-0.06 -0.153,-0.113 -0.221,-0.181 -0.009,-0.009 -0.015,-0.02 -0.022,-0.029 -0.011,-0.01 -0.025,-0.018 -0.037,-0.03 l 0.006,-0.005 c -1,-1.061 -1.012,-2.705 -0.006,-3.712 1.008,-1.007 2.651,-0.994 3.713,0.006 L -7.459,7.393 C -7.479,7.373 -7.503,7.359 -7.523,7.34 -8.581,6.281 -8.607,4.592 -7.581,3.564 c 1.026,-1.025 2.717,-1 3.775,0.059 0.02,0.02 0.033,0.043 0.053,0.065 l 0.011,-0.012 c -1,-1.063 -1.013,-2.705 -0.005,-3.713 1.007,-1.006 2.649,-0.994 3.711,0.006 L -0.03,-0.037 C -0.02,-0.025 -0.011,-0.012 0,0"/></g></g></g><g id="g32"><g clip-path="url(#clipPath36)" id="g34"><g transform="translate(20.5449,13.2764)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.334,-0.958 2.375,-2.791 4.667,-1.082 0,-0.375 -0.333,-2.125 -1.958,-3.125 -1.625,-1 -3.459,0.291 -3.542,2 C -0.916,-0.5 0,0 0,0"/></g><g transform="translate(24.1699,10.1523)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.584,-2.333 3.543,-3.5 5.043,-2.125 -0.293,-0.75 -1.5,-2.458 -2.5,-2.833 -1,-0.375 -4.793,-0.459 -4.918,0.541 C -2.5,-3.417 0,0 0,0"/></g><g transform="translate(27.9629,6.3193)" id="g48"><path id="path50" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.166,-0.709 2.25,-3.417 5.166,-2.042 5.625,-2.792 6.957,-4.834 3.707,-4.792 0.457,-4.75 -2.418,-4.834 -1.834,-3.417 -1.25,-2 0,0 0,0"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(14.4795,13.4453)" id="g60"><path id="path62" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.557,1.844 -4.854,-1.148 -5.793,-0.035 -0.455,0.539 -0.163,1.238 0.435,1.742 1.005,0.85 1.73,0.356 2.185,0.74 0.323,0.272 0.306,0.606 0.114,0.834 -0.446,0.528 -1.586,0.252 -2.472,-0.26 l -0.431,0.51 C -6.23,3.85 -6.707,3.891 -7.025,3.621 -7.344,3.352 -7.384,2.877 -7.115,2.559 l 0.447,-0.53 c -0.677,-0.898 -0.907,-2.09 -0.107,-3.037 1.496,-1.769 4.833,1.172 5.883,-0.072 0.364,-0.432 0.262,-1.256 -0.504,-1.902 -1.148,-0.971 -2.189,-0.516 -2.655,-0.911 -0.227,-0.191 -0.269,-0.554 -0.026,-0.843 0.387,-0.457 1.62,-0.36 2.806,0.379 10e-4,-0.002 10e-4,-0.004 0.002,-0.006 l 0.487,-0.576 c 0.269,-0.319 0.745,-0.358 1.064,-0.09 0.319,0.269 0.358,0.746 0.089,1.064 l -0.487,0.576 c -0.005,0.006 -0.013,0.01 -0.018,0.016 C 0.665,-2.395 0.935,-1.105 0,0"/></g><g transform="translate(13.9556,23.5015)" id="g64"><path id="path66" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.009,0.008 0.019,0.014 0.028,0.022 0.069,0.069 0.121,0.146 0.181,0.221 0.042,0.051 0.088,0.101 0.127,0.155 0.036,0.05 0.065,0.101 0.097,0.152 1.42,2.187 0.489,5.896 -2.322,8.707 -2.811,2.812 -6.52,3.743 -8.707,2.322 -0.051,-0.031 -0.102,-0.061 -0.153,-0.096 -0.053,-0.039 -0.103,-0.086 -0.155,-0.128 -0.074,-0.06 -0.151,-0.112 -0.22,-0.181 -0.009,-0.008 -0.015,-0.019 -0.023,-0.028 -0.011,-0.01 -0.024,-0.019 -0.035,-0.03 l 0.005,-0.005 c -1,-1.062 -1.012,-2.705 -0.005,-3.712 1.007,-1.007 2.65,-0.995 3.712,0.005 L -7.459,7.393 C -7.48,7.374 -7.502,7.36 -7.522,7.341 -8.582,6.282 -8.607,4.592 -7.581,3.565 c 1.026,-1.026 2.716,-1 3.775,0.059 0.02,0.02 0.034,0.043 0.053,0.064 l 0.011,-0.012 c -1,-1.062 -1.013,-2.704 -0.005,-3.712 1.007,-1.007 2.649,-0.995 3.711,0.006 L -0.03,-0.036 C -0.02,-0.025 -0.011,-0.012 0,0"/></g></g></g><g id="g68"><g clip-path="url(#clipPath72)" id="g70"><g transform="translate(2.0415,33.4082)" id="g76"><path id="path78" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.333,-0.958 2.375,-2.792 4.667,-1.083 0,-0.375 -0.334,-2.125 -1.959,-3.125 -1.625,-1 -3.458,0.292 -3.541,2 C -0.917,-0.5 0,0 0,0"/></g><g transform="translate(5.6665,30.2837)" id="g80"><path id="path82" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.583,-2.334 3.542,-3.5 5.042,-2.125 -0.292,-0.75 -1.5,-2.459 -2.5,-2.834 -1,-0.375 -4.792,-0.458 -4.917,0.542 C -2.5,-3.417 0,0 0,0"/></g><g transform="translate(9.4585,26.4502)" id="g84"><path id="path86" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.167,-0.708 2.25,-3.416 5.167,-2.041 5.625,-2.791 6.958,-4.833 3.708,-4.791 0.458,-4.75 -2.417,-4.833 -1.833,-3.416 -1.25,-2 0,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#A7D28B" d="M11.476 10.236c-3.783 5.25-10.408 7.737-10.408 7.737-1.236 1.047-.192 2.281-.192 2.281l10.438 12.359s.522.617 2.28.189c0 0 6.625-2.482 10.407-7.732 3.899-5.41 10.93-7.118 10.93-7.118 1.235-1.047.192-2.283.192-2.283L24.685 3.312s-.522-.618-2.28-.192c0 0-7.03 1.704-10.929 7.116z"/><path fill="#9AAAB4" d="M14.279 7.288c-1.009.831-1.978 1.802-2.803 2.948-.816 1.132-1.768 2.129-2.753 3.007l12.526 14.835c.985-.879 1.938-1.875 2.753-3.008.825-1.144 1.794-2.115 2.803-2.947L14.279 7.288z"/><path fill="#67757F" d="M14.479 22.555c-1.557-1.844-4.853 1.148-5.793.035-.455-.539-.162-1.238.436-1.742 1.005-.85 1.73-.355 2.185-.74.323-.272.306-.605.114-.834-.446-.527-1.586-.252-2.472.26l-.431-.51c-.269-.318-.745-.359-1.063-.09-.318.27-.358.744-.089 1.062l.446.529c-.677.898-.907 2.09-.106 3.037 1.496 1.77 4.833-1.172 5.883.072.364.432.262 1.256-.504 1.902-1.148.971-2.188.516-2.655.91-.228.191-.269.555-.026.844.387.457 1.62.359 2.805-.379.002.002.002.004.002.006l.487.576c.269.318.746.357 1.064.09.319-.27.358-.746.089-1.064l-.487-.576c-.005-.006-.013-.01-.019-.016.799-.978 1.069-2.267.134-3.372z"/><path fill="#E1E8ED" d="M32.456 32.588c.009-.008.019-.014.028-.021.068-.068.121-.146.181-.221.042-.052.089-.102.128-.155.035-.05.064-.101.096-.152 1.42-2.187.49-5.895-2.321-8.707-2.812-2.812-6.521-3.742-8.707-2.321-.052.031-.103.06-.153.096-.053.039-.104.086-.154.127-.074.061-.152.113-.221.182-.009.009-.015.019-.022.028-.011.011-.024.018-.036.03l.006.005c-1 1.062-1.012 2.705-.006 3.712 1.008 1.008 2.65.994 3.713-.006l.011.012c-.021.02-.044.033-.064.053-1.059 1.059-1.084 2.748-.059 3.775 1.026 1.025 2.717 1 3.775-.059.02-.02.033-.043.053-.064l.011.012c-1 1.062-1.013 2.705-.005 3.713 1.007 1.006 2.649.994 3.711-.006l.006.006c.01-.014.018-.027.029-.039z"/><path fill="#CCD6DD" d="M21.277 25.231c.906.905 2.321.979 3.37.261.439-.75.565-1.463.565-1.686-2.207 1.646-4.177.009-4.618-.97-.183.846.039 1.75.683 2.395zm7.299 3.84c.298-.419.529-.824.637-1.098-1.405 1.288-4.091.345-4.905-1.698-.358.95-.175 2.044.571 2.79 1.002 1.002 2.634.994 3.697.006zm3.854 3.595l.029-.036c.01-.008.02-.014.028-.022.069-.068.122-.146.181-.22.043-.053.089-.102.128-.156.036-.049.065-.101.097-.152.065-.1.1-.218.155-.324-2.528 1.131-4.415-.788-4.944-1.745-.295.917-.103 1.944.609 2.657 1.006 1.007 2.648.995 3.711-.006l.006.004z"/><path fill="#E1E8ED" d="M13.956 12.498l.028-.022c.069-.068.122-.146.181-.22.042-.052.088-.101.127-.155.036-.05.065-.101.097-.152 1.42-2.187.489-5.896-2.322-8.707C9.255.43 5.547-.501 3.36.919c-.051.032-.103.061-.153.097-.054.039-.103.085-.155.127-.074.06-.152.112-.22.181-.009.009-.015.02-.022.028-.011.01-.025.019-.036.03l.005.005c-1 1.062-1.012 2.705-.005 3.712 1.007 1.007 2.65.995 3.712-.005l.011.011c-.021.019-.044.033-.064.053-1.059 1.059-1.084 2.748-.058 3.775 1.026 1.027 2.716 1.001 3.775-.058.02-.02.033-.043.053-.064l.011.011c-1 1.062-1.013 2.705-.005 3.712 1.007 1.007 2.649.995 3.711-.006l.005.006c.011-.011.02-.024.031-.036z"/><path fill="#CCD6DD" d="M2.773 5.1c.906.906 2.321.98 3.37.26.439-.75.564-1.462.564-1.685-2.206 1.645-4.177.007-4.617-.972-.183.847.039 1.752.683 2.397zm7.301 3.838c.297-.419.528-.822.635-1.096-1.406 1.288-4.092.344-4.905-1.699-.358.95-.175 2.044.57 2.79 1.004 1.003 2.637.994 3.7.005zm3.851 3.597c.011-.011.02-.024.03-.036l.028-.022c.069-.068.122-.146.181-.22.042-.052.088-.101.127-.155.036-.05.065-.101.097-.152.065-.1.1-.219.155-.325-2.528 1.131-4.415-.787-4.944-1.744-.295.917-.103 1.944.609 2.656 1.007 1.007 2.649.995 3.711-.006l.006.004z"/></svg>
\ No newline at end of file