about summary refs log tree commit diff
path: root/public/emoji/1f468-200d-2696-fe0f.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-2696-fe0f.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-2696-fe0f.svg')
-rw-r--r--public/emoji/1f468-200d-2696-fe0f.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f468-200d-2696-fe0f.svg b/public/emoji/1f468-200d-2696-fe0f.svg
index 01dc234b6..759d30781 100644
--- a/public/emoji/1f468-200d-2696-fe0f.svg
+++ b/public/emoji/1f468-200d-2696-fe0f.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,0)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(17,8)" id="g24"><path id="path26" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 5,-2 5,-8 2,-8 0,0 Z"/></g><g transform="translate(26.9286,8)" id="g28"><path id="path30" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,-2 0,-6 3,0 2,8 z"/></g><g transform="translate(17.6397,7.899)" id="g32"><path id="path34" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.267 2.848,-1.962 4.36,-1.962 1.512,0 2.616,0.696 4.36,1.962 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(17.6318,10.0272)" id="g36"><path id="path38" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(15.4444,20.0646)" id="g40"><path id="path42" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(31.8334,20.0646)" id="g44"><path id="path46" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(13.4777,19.0403)" id="g48"><path id="path50" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.522,10.121 4.707,0 8.523,-4.532 8.523,-10.121 0,-5.589 -3.816,-10.12 -8.523,-10.12 C 3.816,-10.12 0,-5.589 0,0"/></g><g transform="translate(26.5245,14.6537)" id="g52"><path id="path54" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.267,0.275 C -1.671,0.368 -2.44,0.346 -2.802,0.346 l -1.722,0 -1.967,0 c -0.362,0 -1.131,0.022 -1.536,-0.071 L -9.294,0 c -0.348,-0.1 -0.549,-0.392 -0.45,-0.74 0.083,-0.288 0.345,-0.44 0.63,-0.44 0.06,0 0.121,0.026 0.181,0.043 l 1.266,0.37 c -0.142,-0.192 -0.18,-0.447 -0.066,-0.675 0.115,-0.23 0.346,-0.361 0.587,-0.361 0.098,0 0.198,0.024 0.293,0.071 l 1.033,0.517 c 0.024,-0.214 0.14,-0.413 0.347,-0.516 0.094,-0.047 0.194,-0.069 0.292,-0.069 0.241,0 0.472,0.132 0.587,0.362 l 0.07,0.138 -0.054,-0.138 c 0.115,-0.23 0.224,-0.362 0.465,-0.362 0.098,0 0.199,0.022 0.293,0.069 0.206,0.103 0.323,0.302 0.346,0.516 l 1.034,-0.517 c 0.094,-0.047 0.194,-0.071 0.292,-0.071 0.241,0 0.473,0.131 0.588,0.361 0.114,0.228 0.076,0.483 -0.066,0.675 l 1.266,-0.37 c 0.06,-0.017 0.121,-0.043 0.18,-0.043 0.285,0 0.548,0.152 0.63,0.44 C 0.55,-0.392 0.348,-0.1 0,0"/></g><g transform="translate(22,32.5205)" id="g56"><path id="path58" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-4.168 9.178,-7.641 0,-3.473 -0.706,-4.863 -1.412,-3.473 -0.706,1.389 -1.412,2.778 -1.412,2.778 0,0 -4.236,0 -5.648,1.39 0,0 2.118,-4.168 -2.118,0 0,0 0.706,-2.779 -3.53,0.694 0,0 -2.118,-1.389 -2.824,-4.862 -0.196,-0.964 -1.412,0 -1.412,3.473 C -9.178,-4.168 -6.354,0 0,0"/></g><g transform="translate(18,19)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 c 0,0.55 0.45,1 1,1 L 0,3 C 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(26,19)" id="g64"><path id="path66" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 c 0,0.55 0.45,1 1,1 L 0,3 C 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22.75,16.25)" id="g68"><path id="path70" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(22.0008,5.1223)" id="g72"><path id="path74" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 3.381,-2.494 4.093,-2.779 4.249,-2.841 3.727,0.878 3.727,0.878 l -7.454,0 c 0,0 -0.524,-3.782 -0.232,-3.625 C -3.32,-2.405 0,0 0,0"/></g><g transform="translate(23.3125,2.5625)" id="g76"><path id="path78" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.375,0.625 0.531,0.906 0.183,0.329 0.453,1.571 0.453,1.571 l -2.187,0.961 c 0,0.007 -0.16,-0.005 -0.16,-0.005 L -1.547,3.391 -1.719,3.328 C -1.937,3.258 -1.625,3.32 -1.625,3.313 L -3.599,2.477 c 0,0 0.287,-1.242 0.47,-1.571 C -2.973,0.625 -2.601,0 -2.601,0 c 0,0 -0.753,-0.562 -1.035,-2.563 l 2.324,0 0.02,0 2.323,0 C 0.75,-0.969 0,0 0,0"/></g><g transform="translate(17.2917,9.375)" id="g80"><path id="path82" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.566,-0.566 4.709,-3.383 4.709,-3.383 0,0 -2.126,-1.242 -4.084,-3.534 -0.197,-0.23 -1.542,4.625 -1.583,5.709 C -0.97,-0.905 -0.271,0.271 0,0"/></g><g transform="translate(26.7301,9.375)" id="g84"><path id="path86" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.566,-0.566 -4.709,-3.383 -4.709,-3.383 0,0 2.126,-1.242 4.084,-3.534 0.197,-0.23 1.542,4.625 1.583,5.709 C 0.97,-0.905 0.271,0.271 0,0"/></g><g transform="translate(16.3799,8)" id="g88"><path id="path90" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.542,-5.463 5.62,-7.411 l 0,-0.589 -7,0 0,8 L 0,0 Z"/></g><g transform="translate(27.6201,8)" id="g92"><path id="path94" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.542,-5.463 -5.62,-7.411 l 0,-0.589 7,0 0,8 L 0,0 Z"/></g><g transform="translate(12.0829,2.6591)" id="g96"><path id="path98" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.251,0 0.401,-2.659 0.401,-2.659 l -0.956,0 C -0.555,-2.659 -0.362,0 0,0"/></g><g transform="translate(15.0829,2.6591)" id="g100"><path id="path102" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.251,0 0.401,-2.659 0.401,-2.659 l -0.956,0 C -0.555,-2.659 -0.362,0 0,0"/></g><g transform="translate(31.9285,2.6591)" id="g104"><path id="path106" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.251,0 -0.401,-2.659 -0.401,-2.659 l 0.956,0 C 0.555,-2.659 0.362,0 0,0"/></g><g transform="translate(28.9285,2.6591)" id="g108"><path id="path110" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.251,0 -0.401,-2.659 -0.401,-2.659 l 0.956,0 C 0.555,-2.659 0.362,0 0,0"/></g><g transform="translate(7.3819,0)" id="g112"><path id="path114" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.71,0 -3.667,9.707 c -0.155,0.412 -0.619,0.621 -1.031,0.466 -0.411,-0.156 -0.621,-0.62 -0.465,-1.031 L 0,0 Z"/></g><g transform="translate(7.8534,12.3348)" id="g116"><path id="path118" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.468,-1.24 0.178,-2.498 -0.649,-2.811 -0.826,-0.312 -1.876,0.44 -2.345,1.68 -0.468,1.24 -0.178,2.498 0.649,2.811 C -1.518,1.992 -0.468,1.24 0,0"/></g><g transform="translate(5.8632,9.3025)" id="g120"><path id="path122" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.996,-0.754 c -1.097,-0.415 -2.335,0.144 -2.749,1.242 l 0,0 c -0.415,1.098 0.144,2.335 1.242,2.749 l 1.995,0.754 C -0.41,4.406 0.827,3.847 1.242,2.75 l 0,0 C 1.656,1.652 1.098,0.415 0,0"/></g><g transform="translate(3.3631,10.6385)" id="g124"><path id="path126" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.468,-1.24 0.178,-2.498 -0.649,-2.811 -0.826,-0.312 -1.876,0.44 -2.345,1.68 -0.468,1.24 -0.178,2.498 0.649,2.811 C -1.518,1.992 -0.468,1.24 0,0"/></g><g transform="translate(11.3178,0)" id="g128"><path id="path130" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.466,1.588 C -0.829,2.827 -2.139,3.543 -3.377,3.18 L -4.632,2.812 C -5.837,2.458 -6.539,1.208 -6.242,0 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M36 36v-2c0-3.314-2.686-6-6-6H14c-3.313 0-6 2.686-6 6v2h28z"/><path fill="#E1E8ED" d="M17 28h9.929v8H17z"/><path fill="#FFDC5D" d="M17.64 28.101c1.744 1.268 2.848 1.963 4.36 1.963 1.512 0 2.615-.696 4.359-1.963V24.29h-8.72v3.811z"/><path fill="#F9CA55" d="M17.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.146-.373 4.363-1.746v-3.491h-8.728v3.491z"/><path fill="#FFDC5D" d="M15.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#FFDC5D" d="M13.477 16.959c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S26.707 27.08 22 27.08c-4.706 0-8.523-4.531-8.523-10.121"/><path fill="#6D6E71" d="M26.525 21.346l-1.268-.274c-.405-.095-1.173-.072-1.535-.072h-3.689c-.362 0-1.131-.023-1.536.071l-1.266.274c-.348.101-.55.393-.45.74.082.288.345.441.63.441.059 0 .12-.026.18-.042l1.267-.371c-.143.191-.181.446-.066.676.115.228.347.36.587.36.099 0 .199-.024.293-.071l1.034-.518c.022.215.139.414.346.518.094.046.195.069.293.069.241 0 .473-.134.587-.363l.068-.138-.053.138c.114.229.224.363.465.363.098 0 .198-.023.292-.069.207-.104.323-.303.347-.518l1.033.518c.095.047.195.071.293.071.241 0 .472-.132.587-.36.114-.23.076-.484-.066-.676l1.266.371c.059.016.121.042.181.042.285 0 .547-.152.63-.441.099-.347-.102-.639-.45-.739zM22 3.48c5.648 0 9.178 4.168 9.178 7.641s-.706 4.863-1.412 3.473l-1.412-2.778s-4.235 0-5.647-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118 1.389-2.824 4.862-.196.964-1.412 0-1.412-3.473C12.822 7.648 15.646 3.48 22 3.48"/><path fill="#662113" d="M18 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#C1694F" d="M22.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#99AAB5" d="M22.001 30.878s3.381 2.494 4.093 2.778c.156.063-.366-3.656-.366-3.656h-7.454s-.523 3.781-.231 3.625c.638-.343 3.958-2.747 3.958-2.747"/><path fill="#269" d="M23.312 33.438s.375-.625.531-.906c.183-.329.453-1.57.453-1.57v-.963l-4.583.003v.96s.287 1.241.47 1.57c.156.281.528.906.528.906s-.753.562-1.035 2.563h4.667c-.281-1.595-1.031-2.563-1.031-2.563"/><path fill="#F5F8FA" d="M17.292 26.625c.566.566 4.709 3.383 4.709 3.383s-2.126 1.242-4.084 3.534c-.197.23-1.542-4.625-1.583-5.709-.012-.303.687-1.479.958-1.208m9.438 0c-.566.566-4.709 3.383-4.709 3.383s2.126 1.242 4.084 3.534c.196.23 1.542-4.625 1.583-5.709.012-.303-.687-1.479-.958-1.208"/><path fill="#292F33" d="M27.62 28s-1.542 5.463-5.62 7.411C17.922 33.463 16.38 28 16.38 28H15v8h14v-8h-1.38z"/><path fill="#66757F" d="M12.083 33.341c.251 0 .401 2.659.401 2.659h-.956s.193-2.659.555-2.659m3 0c.251 0 .401 2.659.401 2.659h-.956s.193-2.659.555-2.659m16.846 0c-.251 0-.401 2.659-.401 2.659h.956c-.001 0-.194-2.659-.555-2.659m-3 0c-.251 0-.401 2.659-.401 2.659h.956c-.001 0-.194-2.659-.555-2.659"/><path fill="#C1694F" d="M7.854 23.665c.468 1.24.178 2.498-.649 2.812-.826.311-1.876-.441-2.345-1.681-.468-1.239-.178-2.498.649-2.811.826-.312 1.876.44 2.345 1.68"/><path fill="#662113" d="M9.092 36l-3.479-9.208.25-.094c1.098-.415 1.656-1.651 1.242-2.75-.415-1.097-1.652-1.656-2.75-1.241l-1.995.754c-1.098.413-1.657 1.65-1.242 2.749.414 1.098 1.652 1.656 2.749 1.241l.25-.094L7.382 36h1.71z"/><path fill="#C1694F" d="M3.363 25.361c.468 1.24.178 2.498-.649 2.812-.826.312-1.876-.44-2.345-1.681-.468-1.239-.178-2.498.649-2.811.827-.312 1.877.44 2.345 1.68"/><path fill="#FFDC5D" d="M11.318 36l-.466-1.588c-.363-1.239-1.673-1.955-2.911-1.592l-1.255.368c-1.205.354-1.907 1.604-1.61 2.812h6.242z"/></svg>
\ No newline at end of file