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/1f1e6-1f1ee.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/1f1e6-1f1ee.svg')
-rw-r--r-- | public/emoji/1f1e6-1f1ee.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1e6-1f1ee.svg b/public/emoji/1f1e6-1f1ee.svg index cf17878e0..6a91dd9d7 100644 --- a/public/emoji/1f1e6-1f1ee.svg +++ b/public/emoji/1f1e6-1f1ee.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="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" d="M 4,31 C 1.791,31 0,29.209 0,27 l 0,0 0,-9 19,0 0,13 -15,0 z"/></clipPath><clipPath id="clipPath72" clipPathUnits="userSpaceOnUse"><path id="path74" 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,9)" id="g20"><path id="path22" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(19,31)" id="g24"><path id="path26" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-9 19,0 0,13 z"/></g><g transform="translate(19,18)" id="g28"><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2.029 -7.1,7 -12.329,7 -2.332,0 0,0 Z"/></g><g transform="translate(19,19.418)" id="g32"><path id="path34" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.971,5.582 -1.743,0 L 0,-1.22 0,0 Z"/></g><g transform="translate(8.0996,25)" id="g36"><path id="path38" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.1,-5.766 -8.1,-7 -4.768,-7 5.23,0 0,0 Z"/></g><g transform="translate(10.7139,25)" id="g40"><path id="path42" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.98,-7 0.266,0 1.461,0 L 1.744,0 0,0 Z"/></g><g transform="translate(16.6689,31)" id="g44"><path id="path46" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.997,-7 5.229,0 7.099,4.971 L 2.331,0 0,0 Z"/></g><g transform="translate(17.5391,31)" id="g48"><path id="path50" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.996,-7 1.743,0 9.714,6.802 L 1.461,0 0,0 Z"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(10,24)" id="g60"><path id="path62" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.328,0 -6.668,7 -9,7 -9.625,5.406 0,-1.331 0,0 Z"/></g><g transform="translate(10,24)" id="g64"><path id="path66" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.714,0 -9,6.802 -9.5,5.937 0,-0.722 0,0 Z"/></g></g></g><g id="g68"><g clip-path="url(#clipPath72)" id="g70"><g transform="translate(19,27)" id="g76"><path id="path78" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7,0 0,4 -5,0 0,-4 -7,0 0,-5 7,0 0,-4 5,0 0,4 7,0 0,5 z"/></g><path id="path80" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,18 -3,0 0,13 3,0 0,-13 z"/><path id="path82" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,23 -19,0 0,3 19,0 0,-3 z"/><g transform="translate(33.9375,23.6763)" id="g84"><path id="path86" style="fill:#cccc32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.468,-0.51 -3.112,-0.51 -1.643,0 -2.879,0.854 -2.879,0.854 0,0 -1.233,-0.854 -2.877,-0.854 -1.645,0 -3.195,0.51 -3.195,0.51 -0.154,-4.121 0.1,-8.458 1.61,-10.73 1.624,-2.444 4.462,-3.946 4.462,-3.946 0,0 2.754,1.502 4.378,3.946 C -0.102,-8.458 0.154,-4.121 0,0"/></g><g transform="translate(33.416,23.1885)" id="g88"><path id="path90" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.175,-0.439 -2.734,-0.439 -1.563,0 -2.736,0.781 -2.736,0.781 0,0 -1.171,-0.781 -2.731,-0.781 -1.562,0 -2.732,0.439 -2.732,0.439 -0.147,-3.901 0,-7.901 1.512,-9.998 1.513,-2.099 3.951,-3.562 3.951,-3.562 0,0 2.444,1.463 3.956,3.562 C -0.003,-7.901 0.146,-3.901 0,0"/></g><g transform="translate(26.5801,22.603)" id="g92"><path id="path94" style="fill:#ff9900;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.049,-0.683 0.341,-0.926 0,0 0.732,0.146 1.317,-0.098 0.463,-0.193 1.318,-0.536 1.756,-0.39 0.439,0.146 0.829,0.292 0.928,0.195 C 4.439,-1.316 3.853,-1.463 3.755,-1.56 3.657,-1.658 3.317,-1.756 3.512,-2.048 c 0.196,-0.293 0.537,-0.536 0.439,-0.829 0,0 -0.439,0.341 -0.634,0.633 -0.196,0.293 -0.634,0.537 -1.367,0.44 -0.731,-0.098 -1.315,-0.488 -1.413,-0.927 -0.098,-0.439 0.439,-0.39 0.877,-0.488 0,0 -0.634,-0.244 -0.975,-0.244 0,0 -0.292,-0.536 -0.585,-1.024 -0.292,-0.488 -0.342,-0.781 -0.488,-0.732 -0.146,0.049 -0.196,0.732 -0.097,1.122 0,0 -0.341,0.196 -0.293,1.171 0.042,0.833 0.633,1.61 0.633,1.61 0,0 -0.047,0.292 0,0.633 C -0.341,-0.341 0,0 0,0"/></g><g transform="translate(26.0439,19.165)" id="g96"><path id="path98" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.095 -0.076,-0.171 -0.171,-0.171 -0.095,0 -0.171,0.076 -0.171,0.171 0,0.094 0.076,0.17 0.171,0.17 C -0.076,0.17 0,0.094 0,0"/></g><g transform="translate(25.0244,14.2725)" id="g100"><path id="path102" style="fill:#ff9900;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.499,0.47 0.502,0.85 0,0 -0.575,0.474 -0.757,1.083 -0.143,0.48 -0.417,1.358 -0.807,1.606 -0.392,0.248 -0.751,0.458 -0.739,0.595 0.015,0.137 0.498,-0.223 0.636,-0.238 0.137,-0.013 0.428,-0.217 0.532,0.12 0.104,0.336 0.076,0.755 0.365,0.864 0,0 0.013,-0.556 -0.09,-0.892 C -0.462,3.652 -0.373,3.158 0.164,2.652 0.703,2.147 1.375,1.94 1.777,2.143 2.18,2.345 1.803,2.729 1.6,3.131 c 0,0 0.59,-0.337 0.806,-0.603 0,0 0.602,0.114 1.163,0.196 C 4.133,2.805 4.39,2.952 4.444,2.808 4.499,2.664 4.001,2.194 3.636,2.022 c 0,0 0.066,-0.386 -0.721,-0.965 C 2.242,0.561 1.267,0.529 1.267,0.529 c 0,0 -0.195,-0.222 -0.492,-0.4 C 0.48,-0.049 0,0 0,0"/></g><g transform="translate(28.0273,16.0312)" id="g104"><path id="path106" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.073,0.059 0.182,0.048 0.24,-0.025 0.301,-0.098 0.289,-0.206 0.216,-0.266 0.143,-0.325 0.036,-0.313 -0.023,-0.241 -0.084,-0.168 -0.072,-0.06 0,0"/></g><g transform="translate(32.7813,17.1699)" id="g108"><path id="path110" style="fill:#ff9900;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.637,0.256 -0.983,0.1 0,0 -0.189,-0.721 -0.664,-1.141 -0.377,-0.334 -1.059,-0.95 -1.121,-1.408 -0.059,-0.459 -0.099,-0.874 -0.229,-0.919 -0.13,-0.045 -0.006,0.545 -0.051,0.676 -0.045,0.129 0.017,0.48 -0.332,0.432 -0.348,-0.047 -0.718,-0.247 -0.937,-0.032 0,0 0.5,0.246 0.847,0.294 0.348,0.046 0.76,0.335 0.993,1.034 0.233,0.702 0.138,1.399 -0.214,1.678 -0.351,0.28 -0.543,-0.224 -0.824,-0.577 0,0 0.059,0.679 0.208,0.986 0,0 -0.353,0.498 -0.664,0.974 -0.31,0.477 -0.552,0.649 -0.444,0.759 0.107,0.11 0.744,-0.145 1.051,-0.404 0,0 0.326,0.222 1.181,-0.248 0.732,-0.404 1.168,-1.276 1.168,-1.276 0,0 0.286,-0.084 0.572,-0.278 C -0.158,0.457 0,0 0,0"/></g><g transform="translate(29.9248,19.1587)" id="g112"><path id="path114" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.085,0.041 -0.121,0.143 -0.079,0.229 -0.038,0.313 0.063,0.348 0.149,0.307 0.233,0.266 0.269,0.164 0.227,0.079 0.186,-0.006 0.083,-0.042 0,0"/></g><g transform="translate(23.7705,13.5303)" id="g116"><path id="path118" style="fill:#99ccff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.071,-0.118 0.146,-0.232 0.225,-0.34 1.512,-2.099 3.951,-3.561 3.951,-3.561 0,0 2.443,1.462 3.956,3.561 C 8.21,-0.232 8.284,-0.118 8.355,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="#00247D" d="M32 5H4c-.205 0-.407.015-.604.045l-.004 1.754-2.73-.004C.244 7.427 0 8.185 0 9v18c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path fill="#CCCC32" d="M33.938 12.324s-1.468.51-3.112.51c-1.643 0-2.879-.854-2.879-.854s-1.232.854-2.877.854c-1.644 0-3.194-.51-3.194-.51-.154 4.121.1 8.458 1.609 10.73C25.108 25.498 27.946 27 27.946 27s2.754-1.502 4.378-3.946c1.512-2.272 1.768-6.61 1.614-10.73z"/><path fill="#FFF" d="M33.416 12.811s-1.175.439-2.734.439c-1.562 0-2.735-.78-2.735-.78s-1.171.78-2.732.78c-1.562 0-2.731-.439-2.731-.439-.148 3.901 0 7.901 1.512 9.998 1.513 2.099 3.951 3.561 3.951 3.561s2.443-1.463 3.956-3.561c1.51-2.096 1.659-6.096 1.513-9.998z"/><path fill="#F90" d="M26.58 13.397s.049.683.341.926c0 0 .732-.146 1.317.098.463.193 1.317.536 1.756.39.438-.146.829-.292.928-.195.097.097-.489.244-.587.341-.098.098-.438.196-.243.488.196.293.537.537.439.83 0 0-.439-.341-.634-.634-.196-.293-.635-.537-1.367-.439-.732.098-1.316.488-1.413.927-.098.438.438.39.877.487 0 0-.634.244-.975.244 0 0-.293.537-.586 1.024-.292.488-.342.781-.487.732-.146-.049-.196-.732-.098-1.122 0 0-.341-.195-.293-1.17.042-.833.634-1.61.634-1.61s-.048-.292 0-.634c.05-.342.391-.683.391-.683z"/><path fill="#FFF" d="M26.044 16.835c0 .095-.076.171-.171.171-.095 0-.171-.076-.171-.171 0-.094.076-.17.171-.17.095 0 .171.076.171.17z"/><path fill="#F90" d="M25.024 21.728s.499-.47.502-.85c0 0-.575-.475-.757-1.083-.144-.48-.417-1.359-.808-1.607-.392-.248-.751-.458-.738-.595.015-.137.498.224.636.238.137.014.428.217.532-.119.104-.336.076-.755.364-.865 0 0 .014.556-.09.892-.104.335-.015.83.522 1.335.539.505 1.211.712 1.613.509.402-.201.025-.585-.178-.988 0 0 .591.337.807.603 0 0 .601-.113 1.163-.195.563-.082.82-.229.875-.084.055.144-.443.613-.809.785 0 0 .066.387-.721.966-.673.495-1.649.527-1.649.527s-.194.223-.491.4c-.292.179-.773.131-.773.131z"/><path fill="#FFF" d="M28.027 19.969c.073-.059.182-.048.24.025.061.072.049.181-.024.24-.073.059-.18.048-.239-.024-.061-.073-.049-.182.023-.241z"/><path fill="#F90" d="M32.781 18.83s-.637-.256-.983-.1c0 0-.188.721-.664 1.141-.377.334-1.059.95-1.12 1.408-.06.459-.1.874-.229.919-.13.045-.006-.545-.051-.676-.045-.13.017-.48-.332-.433-.348.047-.718.247-.938.032 0 0 .5-.246.848-.294.348-.046.76-.335.993-1.034.232-.702.138-1.398-.215-1.678-.351-.28-.543.224-.823.577 0 0 .059-.679.208-.985 0 0-.354-.498-.664-.975-.31-.477-.553-.648-.444-.759.107-.109.744.145 1.051.404 0 0 .326-.222 1.182.249.731.403 1.168 1.275 1.168 1.275s.285.084.571.278c.284.194.442.651.442.651z"/><path fill="#FFF" d="M29.925 16.841c-.085-.041-.121-.143-.079-.228.041-.085.143-.12.229-.079.084.042.119.143.077.228-.041.085-.144.121-.227.079z"/><path fill="#9CF" d="M23.771 22.47c.071.118.146.232.225.34 1.513 2.099 3.951 3.561 3.951 3.561s2.443-1.463 3.956-3.561c.078-.108.152-.222.224-.34h-8.356z"/><path fill="#00247D" d="M19 18V5H4c-.32 0-.604.045-.604.045l-.004 1.754-2.73-.004S.62 6.854.535 7C.195 7.589 0 8.272 0 9v9h19z"/><path fill="#EEE" d="M19 5h-2.331L12 8.269V5H7v2.569L3.396 5.045c-.614.094-1.19.325-1.672.665L6.426 9H4.69L.967 6.391c-.11.129-.211.262-.305.404L3.813 9H0v5h3.885L0 16.766V18h3.332L7 15.432V18h5v-3.269L16.668 18H19v-2.029L16.185 14H19V9h-2.814L19 7.029V5z"/><path fill="#CF1B2B" d="M11 5H8v5H0v3h8v5h3v-5h8v-3h-8z"/><path fill="#CF1B2B" d="M19 5h-1.461L12 8.879V9h1.571L19 5.198zm-17.276.71c-.281.195-.534.423-.757.681L4.69 9h1.735L1.724 5.71zM6.437 14L.734 18h1.727L7 14.822V14zM19 17.802v-1.22L15.313 14H13.57z"/></svg> \ No newline at end of file |