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/1f54d.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/1f54d.svg')
-rw-r--r-- | public/emoji/1f54d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f54d.svg b/public/emoji/1f54d.svg index 5f33b368b..c82ae007c 100644 --- a/public/emoji/1f54d.svg +++ b/public/emoji/1f54d.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,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 transform="translate(9.9999,27)" id="g12"><path id="path14" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-27 16,-27 16,0 8,8 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(10,27)" id="g24"><path id="path26" style="fill:none;stroke:#292f33;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 8,8 16,0"/></g><g transform="translate(11,0)" id="g28"><path id="path30" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -5,0 c -1.104,0 -2,0.896 -2,2 l 0,14 c 0,1.105 0.896,2 2,2 l 5,0 c 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g><g transform="translate(11.9995,16.2148)" id="g32"><path id="path34" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.171,0.662 0.005,1.395 -0.514,1.914 L -4.05,5.449 c -0.781,0.781 -2.047,0.781 -2.828,0 L -10.414,1.914 C -10.933,1.395 -11.099,0.662 -10.928,0 L 0,0 Z"/></g><path id="path36" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,15 -9,0 0,1 9,0 0,-1 z"/><g transform="translate(25,0)" id="g38"><path id="path40" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2,0 5,0 c 1.105,0 2,0.896 2,2 l 0,14 c 0,1.105 -0.895,2 -2,2 L 2,18 C 0.896,18 0,17.105 0,16 L 0,0 Z"/></g><g transform="translate(34.9355,16.2148)" id="g42"><path id="path44" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.171,0.662 0.005,1.395 -0.515,1.914 l -3.536,3.535 c -0.78,0.781 -2.047,0.781 -2.828,0 L -10.414,1.914 C -10.934,1.395 -11.1,0.662 -10.928,0 L 0,0 Z"/></g><path id="path46" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,15 9,0 0,1 -9,0 0,-1 z"/><g transform="translate(12,16.2148)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 l -9,0 c -0.552,0 -1,0.447 -1,1 0,0.552 0.448,1 1,1 l 9,0 C -0.448,1 0,0.552 0,0"/></g><g transform="translate(35,16.2148)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -9,0 c -0.553,0 -1,0.447 -1,1 0,0.552 0.447,1 1,1 l 9,0 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(17.7993,16)" id="g56"><path id="path58" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.693,0 -1.33,0.388 -1.703,1.038 l -0.672,1.173 -1.581,0 c -0.713,0 -1.34,0.346 -1.675,0.926 -0.346,0.596 -0.327,1.343 0.05,1.999 l 0.765,1.335 -0.765,1.336 c -0.377,0.657 -0.396,1.404 -0.05,2 0.336,0.579 0.963,0.924 1.675,0.924 l 1.581,0 0.671,1.172 c 0.375,0.652 1.012,1.039 1.704,1.039 0.67,0 1.295,-0.368 1.674,-0.984 l 0.757,-1.227 1.856,0 c 0.725,0 1.355,-0.353 1.684,-0.944 C 6.308,9.184 6.271,8.433 5.87,7.781 L 5.061,6.471 5.869,5.162 C 6.27,4.511 6.308,3.761 5.97,3.155 5.641,2.564 5.012,2.211 4.287,2.211 l -1.855,0 L 1.672,0.98 C 1.295,0.367 0.669,0 0,0"/></g><g transform="translate(20.2881,20.2075)" id="g60"><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.811,1.314 1.622,-0.001 0,0 Z m -2.486,-2.13 -0.65,1.133 1.35,0 -0.7,-1.133 z m -3.814,2.131 0.722,1.26 0.722,-1.26 -1.444,0 z M -6.301,4.528 -4.855,4.527 -5.578,3.266 -6.301,4.528 Z m 3.815,2.13 0.699,-1.134 -1.349,0 0.65,1.134 z M 0.226,2.263 -1.171,0 -3.707,0.001 -5.004,2.264 -3.707,4.527 -1.171,4.526 0.226,2.263 Z M 1.622,4.525 0.811,3.212 0.001,4.526 1.622,4.525 Z M 1.397,2.263 2.529,4.098 C 2.741,4.442 2.77,4.805 2.608,5.093 2.456,5.367 2.161,5.524 1.798,5.524 l -2.413,0 -1.052,1.704 c -0.198,0.322 -0.498,0.507 -0.822,0.507 -0.336,0 -0.64,-0.196 -0.836,-0.536 l -0.959,-1.675 -2.16,0 c -0.358,0 -0.654,-0.156 -0.811,-0.427 -0.166,-0.286 -0.147,-0.652 0.052,-1 L -6.152,2.264 -7.203,0.43 c -0.199,-0.347 -0.218,-0.712 -0.052,-1 0.157,-0.271 0.453,-0.427 0.811,-0.427 l 2.16,0 0.959,-1.674 c 0.196,-0.341 0.5,-0.537 0.836,-0.537 0.324,0 0.624,0.185 0.822,0.506 l 1.053,1.705 2.412,0 c 0.363,0 0.658,0.158 0.81,0.431 0.162,0.289 0.133,0.651 -0.079,0.995 L 1.397,2.263 Z"/></g><g transform="translate(13.9873,24.7354)" id="g64"><path id="path66" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.814,-6.658 7.923,-0.003 0,0 Z m 3.812,-7.735 c -0.336,0 -0.64,0.195 -0.836,0.536 l -3.878,6.768 c -0.2,0.348 -0.219,0.714 -0.052,1 0.157,0.271 0.452,0.427 0.81,0.427 l 8.243,0 c 0.363,0 0.658,-0.157 0.81,-0.431 C 9.07,0.277 9.042,-0.086 8.83,-0.43 L 4.634,-7.229 C 4.436,-7.551 4.135,-7.735 3.812,-7.735"/></g><g transform="translate(13.9883,20.209)" id="g68"><path id="path70" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 7.922,-0.002 3.814,6.656 0,0 Z m 8.098,-0.998 -8.243,0 c -0.358,0 -0.653,0.155 -0.81,0.427 -0.167,0.288 -0.148,0.652 0.052,1 l 3.878,6.768 c 0.196,0.341 0.5,0.536 0.836,0.536 0.323,0 0.624,-0.185 0.822,-0.507 L 8.829,0.428 C 9.041,0.084 9.069,-0.278 8.908,-0.567 8.756,-0.841 8.461,-0.998 8.098,-0.998"/></g><path id="path72" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,2 -6,0 0,6.469 6,0 L 21,2 Z"/><g transform="translate(21,8.5)" id="g74"><path id="path76" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.343,-2.5 -3,-2.5 -1.657,0 -3,1.119 -3,2.5 0,1.381 1.343,2.5 3,2.5 1.657,0 3,-1.119 3,-2.5"/></g><path id="path78" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 26,0 10,0 10,2 26,2 26,0 Z"/><g transform="translate(8,7.2148)" id="g80"><path id="path82" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.671,1 -1.5,1 -2.329,1 -3,-0.828 -3,0 l 0,4.5 C -3,5.328 -2.329,6 -1.5,6 -0.671,6 0,5.328 0,4.5 L 0,0 Z"/></g><g transform="translate(31,7.2148)" id="g84"><path id="path86" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,1 -1.5,1 -2.328,1 -3,-0.828 -3,0 l 0,4.5 C -3,5.328 -2.328,6 -1.5,6 -0.672,6 0,5.328 0,4.5 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#A7A9AC" d="M26 9l-8-8-8 8v27h16z"/><path fill="#292F33" d="M26 10c-.256 0-.512-.098-.707-.293L18 2.414l-7.293 7.293c-.391.391-1.023.391-1.414 0s-.391-1.023 0-1.414l8-8c.391-.391 1.023-.391 1.414 0l8 8c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293z"/><path fill="#D1D3D4" d="M11 36H4c-1.104 0-2-.896-2-2V20c0-1.104.896-2 2-2h5c1.104 0 2 .896 2 2v16z"/><path fill="#67757F" d="M12 19.785c.171-.662.005-1.395-.514-1.914L7.95 14.336c-.781-.781-2.047-.781-2.828 0l-3.536 3.536c-.52.519-.686 1.251-.514 1.914H12z"/><path fill="#D1D3D4" d="M2 20h9v1H2zm23 16h7c1.104 0 2-.896 2-2V20c0-1.104-.896-2-2-2h-5c-1.104 0-2 .896-2 2v16z"/><path fill="#67757F" d="M34.936 19.785c.171-.662.005-1.395-.515-1.914l-3.536-3.536c-.78-.781-2.047-.781-2.828 0l-3.535 3.536c-.519.519-.686 1.251-.514 1.914h10.928z"/><path fill="#D1D3D4" d="M25 20h9v1h-9z"/><path fill="#292F33" d="M12 19.785c0 .553-.448 1-1 1H2c-.552 0-1-.447-1-1 0-.552.448-1 1-1h9c.552 0 1 .448 1 1zm23 0c0 .553-.447 1-1 1h-9c-.553 0-1-.447-1-1 0-.552.447-1 1-1h9c.553 0 1 .448 1 1z"/><path fill="#67757F" d="M17.799 20c-.693 0-1.33-.388-1.703-1.038l-.672-1.173h-1.581c-.714 0-1.34-.346-1.676-.926-.345-.597-.326-1.344.05-1.999l.765-1.335-.766-1.336c-.377-.657-.395-1.404-.049-2 .336-.579.962-.924 1.675-.924h1.581l.671-1.172c.375-.651 1.011-1.039 1.704-1.039.67 0 1.295.368 1.674.984l.757 1.227h1.855c.726 0 1.356.353 1.685.945.337.603.3 1.354-.102 2.006l-.809 1.31.808 1.309c.401.651.439 1.401.102 2.007-.329.591-.958.944-1.684.944H20.23l-.76 1.23c-.375.613-1.001.98-1.671.98z"/><path fill="#FFCC4D" d="M17.799 19c-.336 0-.64-.195-.836-.536l-3.878-6.768c-.2-.348-.219-.714-.052-1 .157-.271.453-.427.811-.427h8.242c.363 0 .658.157.811.431.161.288.133.651-.079.996l-4.196 6.799c-.199.32-.499.505-.823.505zm-3.812-7.735l3.814 6.658 4.108-6.656-7.922-.002z"/><path fill="#FFCC4D" d="M22.086 16.789h-8.242c-.358 0-.653-.155-.811-.427-.167-.288-.148-.652.052-1l3.878-6.769c.196-.34.5-.536.836-.536.323 0 .624.185.822.507l4.196 6.798c.212.344.24.706.079.995-.152.275-.447.432-.81.432zm-8.098-.998l7.922.002-4.108-6.658-3.814 6.656z"/><path fill="#67757F" d="M15 27.531h6V34h-6z"/><ellipse fill="#67757F" cx="18" cy="27.5" rx="3" ry="2.5"/><path fill="#D1D3D4" d="M10 34h16v2H10z"/><path fill="#67757F" d="M8 28.785c0 .828-.671-1-1.5-1s-1.5 1.828-1.5 1v-4.5c0-.828.671-1.5 1.5-1.5s1.5.672 1.5 1.5v4.5zm23 0c0 .828-.672-1-1.5-1s-1.5 1.828-1.5 1v-4.5c0-.828.672-1.5 1.5-1.5s1.5.672 1.5 1.5v4.5z"/></svg> \ No newline at end of file |