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/1f938-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/1f938-1f3fd-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f938-1f3fd-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f938-1f3fd-200d-2640-fe0f.svg b/public/emoji/1f938-1f3fd-200d-2640-fe0f.svg index 86abb59e3..79301f54b 100644 --- a/public/emoji/1f938-1f3fd-200d-2640-fe0f.svg +++ b/public/emoji/1f938-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(23.5352,6.9551)" id="g20"><path id="path22" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.945,1.361 -0.746,3.135 0.443,3.963 1.633,4.789 3.365,4.357 4.311,2.996 5.257,1.637 5.058,-0.138 3.867,-0.965 2.678,-1.792 0.945,-1.36 0,0"/></g><g transform="translate(33.1289,33.0127)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.55 -0.451,0.998 -1.003,0.995 L -4.005,0.98 C -4.555,0.979 -5,0.529 -4.998,-0.023 c 0.004,-0.552 0.452,-0.998 1.005,-0.995 l 2.999,0.012 C -0.442,-1.001 0.006,-0.553 0,0"/></g><g transform="translate(4.9771,27.6255)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.034,0.215 0.003,0.446 -0.11,0.654 -0.268,0.482 -0.874,0.659 -1.36,0.393 l -2.487,-1.37 c -0.481,-0.266 -0.66,-0.871 -0.394,-1.356 0.266,-0.486 0.876,-0.661 1.359,-0.394 l 2.487,1.368 C -0.229,-0.552 -0.053,-0.291 0,0"/></g><g transform="translate(24.2539,12.457)" id="g32"><path id="path34" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.871,-3.49 c 0.264,-0.487 0.082,-1.127 -0.4,-1.384 -0.485,-0.264 -1.09,-0.097 -1.354,0.389 l -1.75,3.219 -2.281,-1.586 -0.436,2.134 c -0.141,0.22 -0.264,0.532 -0.364,0.964 -0.605,2.623 -2.102,8.281 -2.102,8.281 1.814,1.262 4.85,-2.379 6.269,-4.42 C -0.203,3.611 0.129,3.658 0.242,3.316 1.291,3.859 1.024,1.992 1.395,2.406 1.395,2.406 1.887,1.08 0,0"/></g><g transform="translate(9.9824,23.2588)" id="g36"><path id="path38" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.145,-0.59 0.162,-1.212 0.742,-1.446 l 8.149,-3.286 c 0.636,-0.255 1.361,0.052 1.618,0.688 0.251,0.64 -0.052,1.36 -0.689,1.617 L 1.672,0.857 C 1.035,1.114 0.311,0.806 0.055,0.169 0.032,0.113 0.015,0.058 0,0"/></g><g transform="translate(3.7485,27.5259)" id="g40"><path id="path42" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.221,-0.506 -0.072,-1.097 0.368,-1.376 l 6.183,-3.931 c 0.483,-0.305 1.136,-0.124 1.455,0.41 0.316,0.535 0.19,1.212 -0.294,1.52 L 1.528,0.552 C 1.046,0.86 0.395,0.677 0.073,0.144 0.044,0.097 0.021,0.049 0,0"/></g><g transform="translate(29.1035,33.4731)" id="g44"><path id="path46" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.477,0.18 -1.018,0.023 -1.257,-0.39 l -3.318,-5.801 c -0.263,-0.454 -0.058,-1.042 0.449,-1.314 0.514,-0.27 1.135,-0.125 1.394,0.329 l 3.323,5.801 C 0.85,-0.924 0.646,-0.333 0.136,-0.063 0.092,-0.037 0.047,-0.019 0,0"/></g><g transform="translate(26.0908,27.6797)" id="g48"><path id="path50" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.427,0.37 -1.071,0.38 -1.51,-0.001 l -6.164,-5.347 c -0.482,-0.417 -0.534,-1.147 -0.118,-1.629 0.423,-0.477 1.147,-0.533 1.628,-0.114 l 6.165,5.347 c 0.482,0.418 0.534,1.146 0.115,1.628 C 0.081,-0.073 0.041,-0.035 0,0"/></g><g transform="translate(29.8594,15.5693)" id="g52"><path id="path54" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.341,-0.033 c -0.516,-0.004 -0.933,-0.428 -0.93,-0.944 0.003,-0.514 0.429,-0.934 0.945,-0.929 l 4.342,0.031 c 0.515,0.004 0.933,0.429 0.93,0.944 C 0.941,-0.416 0.516,0.003 0,0"/></g><g transform="translate(35.3818,13.6982)" id="g56"><path id="path58" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5.077,1.722 C -5.564,1.887 -6.099,1.624 -6.265,1.135 -6.431,0.648 -6.167,0.112 -5.678,-0.053 l 5.076,-1.721 C -0.114,-1.94 0.421,-1.675 0.587,-1.188 0.752,-0.699 0.488,-0.164 0,0"/></g><g transform="translate(29.001,9.1309)" id="g60"><path id="path62" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.536,0.426 -1.155,0.82 -1.155,0.82 0,0 0.556,-0.951 0.568,-1.507 0.012,-0.676 -0.271,-1.092 -0.271,-1.092 -1.328,0.857 -2.454,-0.017 -2.893,0.09 -0.438,0.105 -1.01,1.019 -1.01,1.019 0,0 0.32,-0.815 0.43,-1.105 0.109,-0.288 0.038,-0.702 -0.383,-0.63 -0.4,0.067 -0.84,1.061 -0.576,1.291 0.142,0.124 -0.805,0.761 -0.805,0.761 0,0 -0.32,-1.542 0.218,-2.678 0.038,-0.082 0.084,-0.157 0.126,-0.235 -0.229,0.064 -0.489,0.098 -0.779,0.064 -0.693,-0.081 -1.907,-0.589 -2.52,-1.538 -0.473,-0.731 -0.564,-1.852 -0.564,-1.852 0.226,0.586 0.846,1.003 1.584,1.086 0.977,0.11 1.984,-0.781 2.909,-0.017 0.408,0.337 0.565,0.648 0.604,0.91 0.491,-0.292 1.075,-0.438 1.766,-0.354 1.342,0.164 2.689,1.312 2.986,2.11 C 0.614,-1.832 0.612,-0.487 0,0"/></g><g transform="translate(16.5508,17.8809)" id="g64"><path id="path66" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.816,1.205 -2.518,1.744 -0.699,0.539 -1.703,1.006 -1.703,1.006 0,0 0.549,2.18 1.638,2.891 L 0.856,4.959 4.567,7.1 c 0,0 1.646,-0.917 2.334,-2.065 0,0 -1.633,-1.235 -2.307,-1.627 C 4.912,2.906 4.23,1.822 4.23,1.822 L 0,0 Z"/></g><g transform="translate(17.5952,7.7617)" id="g68"><path id="path70" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.825,3.939 C 2.04,4.407 2.598,4.612 3.067,4.397 3.534,4.181 3.741,3.619 3.524,3.152 L 1.702,-0.789 C 1.485,-1.257 0.926,-1.463 0.457,-1.246 -0.01,-1.029 -0.215,-0.469 0,0"/></g><g transform="translate(17.019,1.959)" id="g72"><path id="path74" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.529,5.335 C 0.58,5.848 1.039,6.225 1.554,6.174 2.065,6.125 2.444,5.663 2.393,5.148 L 1.863,-0.185 C 1.814,-0.697 1.352,-1.074 0.84,-1.025 0.326,-0.974 -0.053,-0.512 0,0"/></g><g transform="translate(21.4277,10.165)" id="g76"><path id="path78" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.568,0.446 0.979,0.776 0,0 -0.41,0.721 0.615,1.479 1.025,0.758 1.687,0.396 1.687,0.396 0,0 0.232,-0.089 1.038,0.154 0.383,0.115 1.148,0.306 1.148,0.306 0,0 -0.041,1.618 -0.268,2.601 L 3.248,5.789 c 0,0 -0.203,0.944 -0.529,1.22 -0.328,0.274 -0.823,0.342 -1.071,0.626 -0.691,0.791 -1.863,3.126 -1.931,3.489 0,0 -0.959,-0.754 -2.635,-1.664 C -3.943,8.901 -6.031,8.463 -6.031,8.463 -5.55,7.808 -3.934,6.478 -3.209,5.681 -2.502,4.903 -1.604,1.995 -2.041,1.509 -2.479,1.021 -3.103,-0.026 -3.103,-0.026 c 0,0 0.615,-0.449 1.033,-0.802 0.584,-0.493 1.072,-0.613 1.072,-0.613 0,0 0.645,1.102 0.998,1.441"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D5AB88" d="M23.535 29.045c-.945-1.361-.746-3.135.443-3.963 1.189-.826 2.922-.395 3.867.967.946 1.359.747 3.134-.443 3.961-1.189.827-2.922.395-3.867-.965z"/><path fill="#DD2E44" d="M33.129 2.987c0-.55-.451-.998-1.003-.995l-3.002.014c-.55.002-.995.452-.993 1.003.004.552.452.998 1.005.995l2.999-.012c.552-.003 1-.452.994-1.005zM4.977 8.375c.034-.215.003-.447-.11-.655-.268-.481-.874-.658-1.36-.392L1.02 8.697c-.481.267-.66.872-.394 1.356.266.485.876.661 1.358.394L4.472 9.08c.277-.154.452-.415.505-.705z"/><path fill="#D5AB88" d="M24.254 23.543l1.871 3.49c.264.486.082 1.127-.4 1.384-.484.264-1.09.097-1.354-.389l-1.75-3.22-2.281 1.586-.435-2.134c-.142-.22-.265-.531-.364-.964-.605-2.623-2.103-8.281-2.103-8.281 1.815-1.262 4.851 2.379 6.27 4.421.344.495.676.448.789.791 1.049-.544.782 1.323 1.153.909-.001.001.491 1.327-1.396 2.407z"/><path fill="#D5AB88" d="M9.982 12.741c-.145.59.162 1.212.742 1.446l8.148 3.285c.637.256 1.361-.052 1.618-.688.251-.64-.052-1.36-.688-1.617l-8.148-3.284c-.637-.257-1.361.052-1.617.689-.022.056-.04.112-.055.169z"/><path fill="#D5AB88" d="M3.749 8.474c-.221.506-.073 1.097.368 1.376l6.183 3.931c.483.305 1.136.124 1.455-.41.316-.536.19-1.213-.294-1.521L5.277 7.922c-.483-.308-1.134-.125-1.455.408-.03.047-.052.095-.073.144zm25.355-5.947c-.478-.18-1.019-.023-1.257.39l-3.318 5.801c-.263.453-.058 1.042.449 1.313.514.27 1.135.125 1.394-.329l3.323-5.801c.259-.451.055-1.042-.455-1.312-.045-.025-.09-.044-.136-.062z"/><path fill="#D5AB88" d="M26.091 8.32c-.427-.37-1.071-.38-1.51.001l-6.164 5.347c-.482.417-.534 1.146-.118 1.629.423.476 1.148.533 1.628.114l6.165-5.347c.482-.418.534-1.146.115-1.628-.035-.042-.075-.081-.116-.116zm3.768 12.111l-4.341.033c-.516.004-.934.428-.931.943.004.515.43.935.945.93l4.342-.031c.516-.004.934-.429.931-.944-.004-.515-.43-.934-.946-.931z"/><path fill="#D5AB88" d="M35.382 22.302l-5.077-1.722c-.487-.165-1.022.098-1.188.587-.166.486.098 1.023.587 1.188l5.076 1.722c.487.166 1.022-.1 1.188-.586.166-.49-.098-1.025-.586-1.189z"/><path fill="#963B22" d="M29.001 26.869c-.536-.426-1.155-.82-1.155-.82s.557.951.568 1.508c.012.676-.272 1.092-.272 1.092-1.327-.857-2.453.017-2.893-.09-.438-.105-1.01-1.019-1.01-1.019s.319.815.43 1.104c.109.288.038.702-.383.631-.4-.067-.84-1.062-.576-1.291.143-.124-.805-.762-.805-.762s-.32 1.542.218 2.679c.038.081.084.157.126.235-.229-.064-.489-.098-.78-.064-.692.081-1.906.589-2.519 1.538-.473.73-.565 1.851-.565 1.851.227-.586.847-1.003 1.584-1.086.978-.11 1.984.781 2.909.018.408-.337.565-.649.604-.91.492.292 1.076.438 1.766.354 1.342-.164 2.69-1.311 2.986-2.11.381-1.026.379-2.371-.233-2.858z"/><path fill="#A0041E" d="M16.551 18.119s-1.816-1.205-2.518-1.744c-.699-.539-1.703-1.006-1.703-1.006s.549-2.18 1.638-2.891l3.439.682 3.711-2.142s1.646.918 2.334 2.065c0 0-1.634 1.235-2.308 1.627.318.502-.363 1.586-.363 1.586l-4.23 1.823z"/><path fill="#D5AB88" d="M17.595 28.238l1.825-3.94c.215-.468.773-.673 1.242-.458.467.217.674.778.457 1.245l-1.822 3.941c-.217.468-.776.674-1.245.457-.467-.215-.672-.776-.457-1.245z"/><path fill="#D5AB88" d="M17.019 34.041l.529-5.335c.051-.513.51-.89 1.024-.839.511.049.89.511.839 1.025l-.53 5.333c-.049.513-.512.89-1.023.841-.513-.051-.892-.513-.839-1.025z"/><path fill="#DD2E44" d="M21.428 25.835s.568-.446.979-.776c0 0-.409-.721.615-1.479 1.025-.758 1.688-.396 1.688-.396s.231.09 1.038-.153c.383-.115 1.147-.307 1.147-.307s-.041-1.617-.267-2.601l-1.951-.077s-.203-.944-.529-1.22c-.328-.274-.822-.342-1.07-.626-.691-.791-1.863-3.126-1.932-3.489 0 0-.959.754-2.635 1.664-1.025.559-3.113.997-3.113.997.481.655 2.098 1.985 2.822 2.782.707.777 1.605 3.685 1.168 4.172-.438.487-1.062 1.535-1.062 1.535s.615.449 1.032.802c.584.493 1.072.613 1.072.613s.645-1.102.998-1.441z"/></svg> \ No newline at end of file |