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/1f939-1f3fd-200d-2640-fe0f.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/1f939-1f3fd-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f939-1f3fd-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f939-1f3fd-200d-2640-fe0f.svg b/public/emoji/1f939-1f3fd-200d-2640-fe0f.svg index b49b5d176..cada29fe4 100644 --- a/public/emoji/1f939-1f3fd-200d-2640-fe0f.svg +++ b/public/emoji/1f939-1f3fd-200d-2640-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(30,0)" id="g20"><path id="path22" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,4 c -0.041,3.516 -2.013,5 -5,5 l -15,0 c -2.986,0 -4,-1.983 -4,-5 l 0,-4 24,0 z"/></g><g transform="translate(17.4546,29.4536)" id="g24"><path id="path26" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.741,0 9.974,-1.871 9.974,-9.974 0,-8.106 0,-9.975 -1.87,-9.975 -1.87,0 -4.363,1.869 -8.104,1.869 -3.741,0 -6.182,-1.869 -8.105,-1.869 -2.084,0 -1.87,7.483 -1.87,9.975 C -9.975,-1.871 -3.741,0 0,0"/></g><g transform="translate(26,9.8371)" id="g28"><path id="path30" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.018,-0.836 -20.018,0 0,-9.001 24,0 0,9.835 L 0,0 Z"/></g><g transform="translate(14,9.0001)" id="g32"><path id="path34" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.85,-2.063 3.55,-2.063 6.25,-2.063 7,0 7,0 L 6.976,3.9 0,4 0,0 Z"/></g><g transform="translate(14.0193,11.3136)" id="g36"><path id="path38" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.058,-1.207 2.049,-1.51 3.477,-1.51 1.426,0 2.426,0.304 3.484,1.51 l 0,2.5 L 0,2.5 0,0 Z"/></g><g transform="translate(9.9722,19.7515)" id="g40"><path id="path42" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.316 3.35,9.625 7.482,9.625 4.131,0 7.48,-4.309 7.48,-9.625 0,-5.313 -3.349,-9.37 -7.48,-9.37 C 3.35,-9.37 0,-5.313 0,0"/></g><g transform="translate(17.4546,12.6221)" id="g44"><path id="path46" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.464,0 -2.23,0.723 -2.312,0.807 -0.243,0.244 -0.243,0.638 0,0.882 0.242,0.239 0.631,0.241 0.876,0.004 C -1.404,1.664 -0.934,1.246 0,1.246 0.946,1.246 1.416,1.678 1.435,1.695 1.685,1.928 2.077,1.922 2.312,1.678 2.549,1.432 2.549,1.047 2.309,0.807 2.229,0.723 1.463,0 0,0"/></g><g transform="translate(8.1421,16.7607)" id="g48"><path id="path50" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.019,0.912 -0.04,0.205 -0.04,0.424 0,3.118 1.871,-0.449 1.871,1.771 0,2.222 1.247,2.444 2.493,3.69 0.624,0.625 1.87,1.847 1.87,1.847 0,0 3.118,-1.884 5.612,-1.884 2.491,0 4.987,-1.253 4.987,-3.746 0,-2.493 1.871,1.442 1.871,-1.674 0,-0.223 -0.021,0.484 -0.037,-0.428 l 0.655,0 c 0.005,1.822 0.005,1.753 0.005,2.919 0,8.103 -6.234,11.121 -9.975,11.121 -3.741,0 -9.974,-2.967 -9.974,-11.072 0,-0.722 -0.019,-1.146 0.007,-2.968 L 0,0 Z"/></g><g transform="translate(14.4141,17.7764)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.423,0 -0.77,0.346 -0.77,0.771 l 0,0.769 c 0,0.423 0.347,0.771 0.77,0.771 0.424,0 0.771,-0.348 0.771,-0.771 l 0,-0.769 C 0.771,0.346 0.424,0 0,0"/></g><g transform="translate(20.5771,17.7764)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.424,0 -0.771,0.346 -0.771,0.771 l 0,0.769 c 0,0.423 0.347,0.771 0.771,0.771 0.424,0 0.771,-0.348 0.771,-0.771 l 0,-0.769 C 0.771,0.346 0.424,0 0,0"/></g><g transform="translate(18.2666,15.3936)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.541,0 c -0.212,0 -0.385,0.174 -0.385,0.387 l 0,0.138 c 0,0.215 0.173,0.389 0.385,0.389 l 1.541,0 c 0.212,0 0.385,-0.174 0.385,-0.389 l 0,-0.138 C 0.385,0.174 0.212,0 0,0"/></g><g transform="translate(5.8945,21.7949)" id="g64"><path id="path66" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3.834,-1.39 -4.214,-6.221 0,0 -2.4,4.817 -0.522,10.15 L 0,0 Z"/></g><g transform="translate(20.0508,30.0229)" id="g68"><path id="path70" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.758,3.005 -7.363,1.497 0,0 3.523,4.069 9.168,4.386 L 0,0 Z"/></g><g transform="translate(29.2715,19.6631)" id="g72"><path id="path74" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.972,3.571 -0.923,7.457 0,0 4.978,-2.046 7.075,-7.296 L 0,0 Z"/></g><g transform="translate(8.103,25.0137)" id="g76"><path id="path78" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.567,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.933 -5.433,3.5 -3.5,3.5 -1.567,3.5 0,1.933 0,0"/></g><g transform="translate(26.0156,32.5)" id="g80"><path id="path82" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.566,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.933 -5.433,3.5 -3.5,3.5 -1.566,3.5 0,1.933 0,0"/></g><g transform="translate(35.8955,18.1455)" id="g84"><path id="path86" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.566,-3.5 -3.5,-3.5 -5.434,-3.5 -7,-1.933 -7,0 -7,1.933 -5.434,3.5 -3.5,3.5 -1.566,3.5 0,1.933 0,0"/></g><g transform="translate(32.6455,12.5117)" id="g88"><path id="path90" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.111,0.538 -0.634,0.884 -1.169,0.774 l -2.057,-0.43 -1.808,0 c -0.85,0 -1.538,-0.696 -1.538,-1.555 l 0,-0.776 0,-0.777 3.846,0 c 0.83,0 1.503,0.666 1.533,1.496 l 0.273,0.057 0.503,0 c 0,0.059 -0.022,0.113 -0.035,0.169 C -0.11,-0.827 0.085,-0.421 0,0"/></g><g transform="translate(36.0752,12.0791)" id="g92"><path id="path94" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.429 -0.344,0.776 -0.77,0.776 L -5.386,0 -9.232,0 c -0.426,0 -0.77,-0.349 -0.77,-0.778 l -0.073,-1.551 1.611,-0.002 3.078,0 4.616,1.553 C -0.77,-0.778 0,-0.43 0,0"/></g><g transform="translate(3.4302,8.7637)" id="g96"><path id="path98" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.11,0.538 0.633,0.884 1.168,0.774 l 2.058,-0.43 1.807,0 c 0.85,0 1.539,-0.696 1.539,-1.555 l 0,-0.776 0,-0.777 -3.847,0 c -0.829,0 -1.503,0.666 -1.532,1.496 l -0.273,0.057 -0.503,0 c 0,0.059 0.022,0.113 0.035,0.169 C 0.11,-0.827 -0.085,-0.421 0,0"/></g><g transform="translate(0,8.3311)" id="g100"><path id="path102" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.429 0.344,0.776 0.769,0.776 L 5.386,0 9.233,0 c 0.425,0 0.769,-0.349 0.769,-0.778 l 0,-1.553 -1.539,0 -3.077,0 -4.617,1.553 C 0.769,-0.778 0,-0.43 0,0"/></g><path id="path104" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,6 -1,0 0,-6 1,0 0,6 z"/><path id="path106" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,9 -1,0 0,-9 1,0 0,9 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M30 36v-4c-.041-3.516-2.013-5-5-5H10c-2.986 0-4 1.983-4 5v4h24z"/><path fill="#963B22" d="M17.455 6.546c3.741 0 9.974 1.871 9.974 9.974 0 8.106 0 9.975-1.87 9.975s-4.363-1.869-8.104-1.869c-3.741 0-6.182 1.869-8.104 1.869-2.084 0-1.871-7.482-1.871-9.975-.001-8.103 6.233-9.974 9.975-9.974"/><path fill="#9266CC" d="M26 26.163l.017.836H6V36h24v-9.835z"/><path fill="#D5AB88" d="M14 27s.85 2.063 3.55 2.063S21 27 21 27l-.024-3.9L14 23v4z"/><path fill="#CC9B7A" d="M14.019 24.686c1.058 1.207 2.049 1.51 3.477 1.51 1.426 0 2.426-.304 3.485-1.51v-2.5H14.02v2.5z"/><path fill="#D5AB88" d="M9.972 16.249c0-5.316 3.35-9.625 7.482-9.625 4.13 0 7.48 4.309 7.48 9.625 0 5.313-3.35 9.37-7.48 9.37-4.132-.001-7.482-4.057-7.482-9.37"/><path fill="#DF1F32" d="M17.455 23.378c-1.464 0-2.229-.723-2.312-.807-.243-.244-.243-.639 0-.883.242-.238.631-.24.876-.004.032.029.502.447 1.436.447.946 0 1.417-.432 1.435-.449.25-.232.642-.226.877.018.237.246.237.631-.003.871-.08.084-.846.807-2.309.807"/><path fill="#963B22" d="M8.142 19.239c-.019-.912-.04-.205-.04-.424 0-3.118 1.871.449 1.871-1.771 0-2.222 1.247-2.444 2.494-3.69.624-.625 1.87-1.847 1.87-1.847s3.117 1.883 5.612 1.883c2.491 0 4.987 1.253 4.987 3.747 0 2.492 1.87-1.442 1.87 1.674 0 .223-.021-.484-.037.428h.655c.005-1.822.005-1.753.005-2.918 0-8.104-6.233-11.122-9.975-11.122-3.74 0-9.974 2.967-9.974 11.072 0 .723-.019 1.146.007 2.968h.655z"/><path fill="#662113" d="M14.414 18.224c-.423 0-.77-.346-.77-.771v-.769c0-.424.348-.771.77-.771.424 0 .771.347.771.771v.769c.001.425-.347.771-.771.771m6.163 0c-.424 0-.771-.346-.771-.771v-.769c0-.424.347-.771.771-.771.424 0 .771.347.771.771v.769c.001.425-.347.771-.771.771"/><path fill="#C1694F" d="M18.267 20.606h-1.541c-.212 0-.385-.174-.385-.387v-.139c0-.215.173-.389.385-.389h1.541c.212 0 .385.174.385.389v.139c-.001.214-.173.387-.385.387"/><path fill="#D1D3D4" d="M5.895 14.205s-3.834 1.39-4.214 6.221c0 0-2.4-4.817-.522-10.149l4.736 3.928zm14.156-8.228s-2.758-3.005-7.363-1.497c0 0 3.522-4.069 9.167-4.387l-1.804 5.884zm9.22 10.36s1.972-3.571-.923-7.457c0 0 4.978 2.046 7.075 7.296l-6.152.161z"/><circle fill="#5C913B" cx="4.603" cy="10.986" r="3.5"/><circle fill="#BE1931" cx="22.516" cy="3.5" r="3.5"/><circle fill="#3B88C3" cx="32.396" cy="17.854" r="3.5"/><path fill="#CC9B7A" d="M32.646 23.488c-.111-.538-.634-.884-1.169-.774l-2.057.431h-1.809c-.85 0-1.538.695-1.538 1.555v1.552h3.847c.83 0 1.503-.666 1.532-1.496l.273-.057h.503c0-.059-.022-.113-.035-.169.342-.215.537-.621.453-1.042z"/><path fill="#D5AB88" d="M36.075 23.921c0-.429-.344-.776-.77-.776l-4.616.776h-3.847c-.426 0-.77.349-.77.778L26 26.25l1.611.002h3.078l4.616-1.553c.001 0 .77-.348.77-.778z"/><path fill="#CC9B7A" d="M3.43 27.236c.11-.538.633-.884 1.168-.774l2.058.431h1.808c.85 0 1.539.695 1.539 1.555V30H6.155c-.83 0-1.503-.666-1.532-1.496l-.273-.057h-.503c0-.059.022-.113.036-.169-.343-.215-.538-.621-.453-1.042z"/><path fill="#D5AB88" d="M0 27.669c0-.429.344-.776.769-.776l4.617.776h3.847c.425 0 .769.349.769.778V30H5.386L.769 28.447S0 28.099 0 27.669z"/><path fill="#744EAA" d="M10 30h1v6h-1zm15-3h1v9h-1z"/></svg> \ No newline at end of file |