about summary refs log tree commit diff
path: root/public/emoji/1f468-200d-1f469-200d-1f466.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/1f468-200d-1f469-200d-1f466.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/1f468-200d-1f469-200d-1f466.svg')
-rw-r--r--public/emoji/1f468-200d-1f469-200d-1f466.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f468-200d-1f469-200d-1f466.svg b/public/emoji/1f468-200d-1f469-200d-1f466.svg
index ce5ccdd20..8f5fad9f5 100644
--- a/public/emoji/1f468-200d-1f469-200d-1f466.svg
+++ b/public/emoji/1f468-200d-1f469-200d-1f466.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" d="M 0,0 36,0 36,36 0,36 0,0 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g transform="translate(9.9997,18)" id="g12"><path id="path14" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 2,0 0,-6 -9,0 0,6 2,0 0,4"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(8.1389,36)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.338,0 -2.602,-0.305 -3.739,-0.836 -0.197,0.017 -0.394,0.03 -0.594,0.03 -3.944,0 -7.14,-3.195 -7.14,-7.139 0,-3.123 2.01,-5.772 4.805,-6.74 1.625,-1.859 4.006,-3.038 6.668,-3.038 4.894,0 8.861,3.968 8.861,8.862 C 8.861,-3.967 4.894,0 0,0"/></g><g transform="translate(-3e-4,32)" id="g28"><path id="path30" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-10 0.024,0 c 0.253,-3.89 3.498,-6.969 7.476,-6.969 3.977,0 7.247,3.079 7.5,6.969 l 0,9 -15,1 z"/></g><g transform="translate(14.9997,14)" id="g32"><path id="path34" style="fill:#3b94d9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5,0 -7.472,-3.778 -10,0 -16,0 c -1.779,0 -1.945,-1.193 -1.945,-2.973 l 0,-11.027 4.028,0 12.889,0 L 3,-14 3,-2.973 C 3,-1 2,0 0,0"/></g><path id="path36" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 13.027,0 -1.028,0 0,10 1.028,0 0,-10 z"/><g transform="translate(10.7216,18.2773)" id="g38"><path id="path40" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.222,0 -3.222,0 c 0,0 0.805,-1.61 3.222,-1.61 C -0.805,-1.61 0,0 0,0"/></g><g transform="translate(3.9997,23)" id="g42"><path id="path44" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(10.9997,23)" id="g46"><path id="path48" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(7.9997,20.5)" id="g50"><path id="path52" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,0 C -1.276,0 -1.5,0.224 -1.5,0.5 -1.5,0.776 -1.276,1 -1,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(15.8054,26)" id="g54"><path id="path56" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,6 -2,1 -13,0 0,-7 C -9.93,0 -6.451,2.576 -4.644,4.603 -4.079,2.83 -2.747,0 0,0"/></g><g transform="translate(32.5381,35.1924)" id="g58"><path id="path60" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.333,0 -0.657,-0.034 -0.974,-0.09 -1.172,0.57 -2.174,0.898 -3.564,0.898 -4.907,0 -9,-4.093 -9,-9 l 0,-7 c 0.148,-5.224 4.241,-9.569 9.5,-9.569 5.259,0 9.352,4.345 9.5,9.569 l 0,10 C 5.462,-2.07 3.123,0 0,0"/></g><g transform="translate(21,14)" id="g62"><path id="path64" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 16.055,0 C 17.835,0 18,-1.193 18,-2.973 L 18,-14 13.972,-14 1.083,-14 -3,-14 -3,-2.973 C -3,-1 -2,0 0,0"/></g><path id="path66" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,0 -1.028,0 0,10 L 23,10 23,0 Z"/><g transform="translate(21,32)" id="g68"><path id="path70" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-10 c 0.253,-3.89 3.521,-6.969 7.5,-6.969 3.979,0 7.247,3.079 7.5,6.969 L 15,0 0,0 Z"/></g><g transform="translate(32.6348,32.3271)" id="g72"><path id="path74" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.25,0.412 0.365,0.673 0.365,0.673 l -12,-1 -0.577,-5.693 c 5.692,0 9.024,2.305 10.815,4.21 0.415,-1.474 1.563,-3.517 4.762,-3.517 l 0,6 L 0,0 Z"/></g><g transform="translate(29,20.5)" id="g76"><path id="path78" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,0 C -1.276,0 -1.5,0.224 -1.5,0.5 -1.5,0.776 -1.276,1 -1,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(25,23)" id="g80"><path id="path82" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(32,23)" id="g84"><path id="path86" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(26,17)" id="g88"><path id="path90" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-3 C 0,-4.381 1.119,-5.5 2.5,-5.5 3.881,-5.5 5,-4.381 5,-3 L 5,0 0,0 Z"/></g><g transform="translate(25.2695,18.231)" id="g92"><path id="path94" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.23,0 6.461,0 C 6.461,0 5.653,-1.616 3.23,-1.616 0.808,-1.616 0,0 0,0"/></g><g transform="translate(18.4727,21)" id="g96"><path id="path98" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.245,0 -2.417,-0.297 -3.464,-0.812 -3.33,-0.07 -6.009,-2.787 -6.009,-6.133 0,-2.194 1.155,-4.114 2.886,-5.2 1.402,-2.152 3.826,-3.578 6.587,-3.578 4.342,0 7.861,3.52 7.861,7.862 C 7.861,-3.52 4.342,0 0,0"/></g><g transform="translate(20,1)" id="g100"><path id="path102" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,4 -4,0 0,-4 -1,0 0,-1 6,0 0,1 -1,0 z"/></g><g transform="translate(25,16)" id="g104"><path id="path106" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.557,0 C -4.574,0.574 -5.749,0.906 -7.003,0.906 -8.257,0.906 -9.431,0.574 -10.449,0 L -14,0 l 0,-6 0.002,0 c 0,-0.016 -0.002,-0.031 -0.002,-0.047 0,-3.84 3.133,-6.953 6.997,-6.953 3.864,0 6.997,3.113 6.997,6.953 0,0.016 -0.002,0.031 -0.002,0.047 L 0,-6 0,0 Z"/></g><g transform="translate(26,13)" id="g108"><path id="path110" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,4 -4.729,4.622 C -4.181,5.42 -4,6 -4,6 L -15,5 -15.861,0 c 5.41,0 8.425,1.755 10.065,3.367 C -4.56,1.908 -2.472,0 0,0"/></g><g transform="translate(23,3)" id="g112"><path id="path114" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 -2,-3 -2,3 -2,0 c -3,0 -5,-2 -5,-4 l 0,-1 2,0 14,0 2,0 0,1 C 4,-2.027 2,0 0,0"/></g><g transform="translate(21,6)" id="g116"><path id="path118" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 -3,0 c 0,0 0.583,-2 3,-2 2.417,0 3,2 3,2"/></g><g transform="translate(18,6.5)" id="g120"><path id="path122" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.13,0 -0.26,0.05 -0.35,0.15 -0.1,0.09 -0.15,0.22 -0.15,0.35 0,0.13 0.05,0.26 0.15,0.36 C -0.18,1.03 0.17,1.04 0.36,0.851 0.45,0.76 0.5,0.63 0.5,0.5 0.5,0.37 0.45,0.24 0.35,0.15 0.26,0.05 0.13,0 0,0"/></g><g transform="translate(15,8)" id="g124"><path id="path126" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,1 C -1,2.553 -0.552,3 0,3 0.552,3 1,2.553 1,2 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(21,8)" id="g128"><path id="path130" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,1 C -1,2.553 -0.553,3 0,3 0.553,3 1,2.553 1,2 L 1,1 C 1,0.447 0.553,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M21 14c.253 3.89 3.521 6.969 7.5 6.969S35.747 17.89 36 14V4H21v10z"/><path fill="#FFAC33" d="M36 21.752V14c-.253 3.89-3.521 6.969-7.5 6.969S21.253 17.89 21 14V9.663c5.328-.155 8.51-2.343 10.237-4.181C31.652 6.957 32.801 9 36 9V1.9c-.931-.689-2.115-1.093-3.462-1.093-.333 0-.657.034-.974.09C30.393.328 29.39 0 28 0c-4.907 0-9 4.093-9 9v7c.064 2.258.868 4.35 2.182 6L24 24h9l2.818-2c.064-.08.121-.166.182-.248z"/><path fill="#9268CA" d="M35.818 22H21c-2 0-3 1-3 2.973V36h18V22h-.182z"/><path fill="#7450A8" d="M20.986 26h1.028v10h-1.028z"/><path fill="#FFDC5D" d="M26 19v3c0 1.381 1.119 2.5 2.5 2.5S31 23.381 31 22v-3h-5z"/><path fill="#DA2F47" d="M25.27 17.769h6.46s-.808 1.616-3.23 1.616-3.23-1.616-3.23-1.616z"/><path fill="#BF6952" d="M29 15.5h-1c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h1c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M25 13c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1zm7 0c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1z"/><path fill="#FFDC5D" d="M5 22v-4h5v4h2v6H3v-6z"/><path fill="#3B94D9" d="M15 22h-5l-2.472 3.778L5 22H0v14h18V24.973C18 23 17 22 15 22z"/><path fill="#1B6399" d="M13.986 26h1.028v10h-1.028z"/><path fill="#FFDC5D" d="M15 14V5L0 4v10h.024c.252 3.89 3.498 6.969 7.476 6.969 3.791 0 6.932-2.799 7.438-6.428.025-.18.05-.358.062-.541z"/><path fill="#FFAC33" d="M3.806.806C2.405.806 1.102 1.215 0 1.912v8.083c5.947-.055 9.375-2.593 11.162-4.598.506 1.589 1.633 4.021 3.838 4.51V14c-.012.183-.037.361-.062.54C16.224 13.002 17 11.023 17 8.861 17 3.967 13.033 0 8.139 0 6.801 0 5.538.305 4.4.836c-.196-.017-.394-.03-.594-.03zM15 5v.166l-.028-.167L15 5z"/><path fill="#BF6952" d="M10.722 17.723H4.278s.805 1.61 3.222 1.61 3.222-1.61 3.222-1.61zM8 15.5H7c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h1c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M4 13c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm7 0c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1z"/><path fill="#FFDC5D" d="M20.091 35v-4h-4v4h-1v1h6v-1z"/><path fill="#88C9F9" d="M23.091 33h-3l-2 3h8.818c-.518-1.602-2.159-3-3.818-3zM9.277 36h8.814l-2-3h-2c-.368 0-.719.032-1.055.088-1.941.326-3.301 1.535-3.759 2.912z"/><path fill="#FFDC5D" d="M25.085 26.047L25.083 26h.008v-6h-3.557c-1.018-.574-2.192-.906-3.446-.906s-2.428.332-3.446.906h-3.551v6h.002l-.002.047c0 .145.013.286.022.428.224 3.64 3.257 6.525 6.975 6.525 3.383 0 6.206-2.387 6.856-5.558.092-.451.141-.917.141-1.395z"/><path fill="#F4900C" d="M26.425 22.861c0-4.342-3.519-7.861-7.861-7.861-1.245 0-2.418.297-3.464.812-3.33.07-6.009 2.786-6.009 6.133 0 1.8.786 3.408 2.022 4.53-.009-.142-.022-.284-.022-.428l.002-.047h-.002v-3.035c4.856-.18 7.656-1.81 9.204-3.332 1.065 1.257 2.765 2.841 4.796 3.257V26h-.008l.002.047c0 .478-.049.944-.141 1.395.928-1.291 1.481-2.869 1.481-4.581z"/><path fill="#BF6952" d="M21.091 30h-6s.583 2 3 2 3-2 3-2zm-3-.5c-.13 0-.26-.05-.35-.15-.1-.09-.15-.22-.15-.35s.05-.26.15-.36c.17-.17.52-.18.71.01.09.091.14.221.14.351s-.05.26-.15.35c-.09.099-.22.149-.35.149z"/><path fill="#662113" d="M15.091 28c-.552 0-1-.447-1-1v-1c0-.553.448-1 1-1s1 .447 1 1v1c0 .553-.448 1-1 1zm6 0c-.553 0-1-.447-1-1v-1c0-.553.447-1 1-1 .553 0 1 .447 1 1v1c0 .553-.447 1-1 1z"/></svg>
\ No newline at end of file