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/1f3c7-1f3fc.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/1f3c7-1f3fc.svg')
-rw-r--r-- | public/emoji/1f3c7-1f3fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3c7-1f3fc.svg b/public/emoji/1f3c7-1f3fc.svg index b8509d9d1..f80fc3236 100644 --- a/public/emoji/1f3c7-1f3fc.svg +++ b/public/emoji/1f3c7-1f3fc.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(27.0762,20.3354)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 4.687,-1.807 6.761,-0.601 8.835,0.604 9.27,2.246 8.063,4.319 6.855,6.391 3.576,7.26 3.407,9.937 3.407,9.937 3.143,5.618 5.384,4.15 8.556,2.07 4.939,-0.237 1.177,0.235 -2.588,0.707 0,0 0,0"/></g><g transform="translate(2.688,11.2871)" id="g24"><path id="path26" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.736,-2.285 -0.349,-6.011 0.794,-6.378 1.141,-0.367 2.877,1.61 1.897,2.993 C 0.794,-0.708 1.913,1.161 4.195,0.426 6.479,-0.309 12.881,1.572 14.389,2.348 15.897,3.12 9.829,3.138 7.178,2.732 4.527,2.324 3.062,2.693 1.876,1.916 0.872,1.258 0,0 0,0"/></g><g transform="translate(17.792,3.8555)" id="g28"><path id="path30" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.38,0.986 0.593,3.799 2.96,3.408 5.326,3.013 6.73,1.901 6.903,5.183 6.925,5.564 7.423,5.17 8.22,5.797 16.438,12.259 9.27,12.085 9.27,12.085 6.508,10.111 3.572,6.971 4.537,5.576 5.044,4.845 1.975,4.786 0.791,4.984 -0.391,5.181 -1.97,3.01 -2.168,1.827 -2.363,0.646 -1.379,-0.985 0,0"/></g><g transform="translate(30.8291,17.249)" id="g32"><path id="path34" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.006,1.129 -1.757,4.602 -5.294,4.602 -3.6,0 -5.998,-1.199 -8.397,-1.199 -2.399,0 -3.939,-1.449 -5.139,3.348 -0.919,3.68 -3.401,5.201 -7,4 0,0 -3.455,2.248 -2.255,1.048 0.494,-0.494 0.706,-0.994 0.762,-1.459 -2.103,-1.257 -1.131,-3.416 -2.253,-4.539 -0.848,-0.847 -1.199,-1.199 -1.199,-2.398 0,-0.991 1.629,-1.15 2.875,-0.505 0.723,1.704 0.353,1.057 1.473,1.707 1.029,0.017 1.94,0.151 1.94,1.196 0,0 1.2,0 1.2,-2.398 0,-1.144 -1.083,-2.292 0.893,-5.513 0,0 1.19,-1.912 0.836,-2.581 -1.254,-2.371 -1.533,-5.044 -2.507,-5.743 -0.977,-0.698 0.419,-2.648 0.419,-2.648 1.395,-1.952 4.742,-2.508 5.718,-1.812 0.976,0.699 0.278,1.675 -1.395,1.955 -1.673,0.275 -5.021,0.833 -3.07,2.227 1.952,1.397 3.287,1.79 3.563,3.463 0.079,0.469 2,1 2,1 0,0 2,-1 4.337,0.055 2.043,0.922 4.481,2.089 6.722,0.414 l 0.069,0.039 c -0.713,-1.535 -0.968,-2.893 -0.275,-3.477 0.683,-0.573 -2.265,-1.434 -3.46,-1.554 -1.193,-0.122 -2.147,-2.627 -2.027,-3.82 0.121,-1.193 1.748,-2.7 2.82,-1.388 1.074,1.315 -2.107,3.163 1.714,4.255 2.307,0.66 4.034,-0.466 3.341,2.746 -0.081,0.374 0.068,0.786 0.693,1.586 C 0.388,-3.177 -0.008,-1.13 0,0"/></g><g transform="translate(22.3086,21.5312)" id="g36"><path id="path38" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.959,-0.354 -3.571,-0.879 -5.17,-0.879 -1.064,0 -1.888,0.017 -2.585,0.436 0.058,-1.778 0.558,-3.676 2.476,-6.282 0.423,-0.093 0.857,-0.152 1.307,-0.152 2.4,0 3.599,1.199 5.997,2.398 C 0.706,-2.525 0.41,-1.74 0,0"/></g><g transform="translate(4.2695,27.6709)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.399,2.399 4.428,1.897 6.323,0 8.723,-2.398 7.657,-4.922 10.47,-6.82 11.73,-7.67 7.73,-7.67 6.871,-3.221 6.362,-0.588 3.488,0.677 0,0"/></g><g transform="translate(1.9995,21.5005)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.128,0 -0.256,0.049 -0.354,0.146 -0.195,0.196 -0.195,0.512 0,0.708 l 4,4 c 0.196,0.195 0.512,0.195 0.708,0 0.195,-0.196 0.195,-0.512 0,-0.708 l -4,-4 C 0.256,0.049 0.128,0 0,0"/></g><g transform="translate(6.9995,22.5005)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.198,0 -0.386,0.119 -0.464,0.314 l -2,5 c -0.103,0.257 0.022,0.548 0.278,0.65 0.254,0.103 0.547,-0.022 0.65,-0.278 l 2,-5 C 0.567,0.429 0.442,0.138 0.186,0.036 0.125,0.011 0.062,0 0,0"/></g><g transform="translate(11.8159,28.7466)" id="g52"><path id="path54" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.698,-0.674 0.878,-1.429 1.13,-2.391 0.175,-0.663 1.372,-0.023 1.372,-0.023 0,0 1.295,0.323 2.682,-0.332 1.32,-0.624 2.66,-0.383 2,1 C 6.52,-0.364 3.774,-1.042 3.738,0.329 3.646,3.61 0,0 0,0"/></g><g transform="translate(12.0479,28.3691)" id="g56"><path id="path58" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.352,-1.032 -0.977,0.454 -0.728,1.184 -0.378,2.214 1.05,3.095 2.13,2.942 3.207,2.791 3.937,1.605 3.586,0.575 3.338,-0.154 3.599,-1.048 2.871,0.135 2.143,1.319 2.155,-0.305 1.792,0.287 1.427,0.879 0,0 0,0"/></g><g transform="translate(20,13.5)" id="g60"><path id="path62" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.629,0 -0.762,-0.321 -0.971,0.307 -1.232,1.093 -0.786,1.238 0,1.5 l 1,1 c -0.672,1.17 -2.305,3.219 -2.5,4.001 -0.5,2 -0.5,3 3.571,4.795 -0.033,0.04 -0.076,0.088 -0.132,0.144 -1.732,1.732 -2.939,-0.939 -4.94,0.061 -0.739,0.369 0.423,-0.526 -1,0.999 -0.564,0.606 0.214,1.739 1,2 3.952,1.319 5.865,1.258 8.062,-0.939 C 6.144,12.478 6,11.164 6,10.501 c 0,-3 -5,-2 -4.501,-4 C 1.568,6.138 2.388,4.624 3.248,3.332 3.508,2.943 4.151,1.942 4,1.5 3.849,1.058 2.918,1.226 2.475,1.077 l -2,-1 C 0.316,0.024 0.156,0 0,0"/></g><g transform="translate(17.7549,25.0005)" id="g64"><path id="path66" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.631,-0.9 3.14,0.776 4.478,-0.061 L 7.306,2.061 C 7.251,4 2.245,6 -1.336,3.423 -1.968,2.968 -2.415,2.288 -2.196,1.526 -1.755,0 -0.67,0.37 0,0"/></g><g transform="translate(22,19.0005)" id="g68"><path id="path70" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.198,-1.279 C -1.741,-1.901 -1.274,-2.522 -1,-3.001 l -1,-1 c -0.786,-0.261 -1.232,-0.407 -0.971,-1.193 0.209,-0.628 0.342,-0.307 0.971,-0.307 0.156,0 0.316,0.025 0.475,0.078 l 2,1 C 0.918,-4.275 1.849,-4.443 2,-4.001 2.151,-3.558 1.508,-2.557 1.248,-2.169 0.844,-1.561 0.312,-0.563 0,0"/></g><g transform="translate(14.9995,21.0005)" id="g72"><path id="path74" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2,0 -2,0.448 -2,1 -2,1.552 -0.552,2 0,2 1.984,2 2.276,2.285 2.303,2.317 2.393,2.515 2.156,2.688 1,5 0.753,5.494 1.059,6.647 1.553,6.895 2.048,7.143 2.648,6.94 2.895,6.447 4.024,4.189 4.764,2.495 4.003,1.263 3.354,0.215 1.934,0 0,0"/></g><g transform="translate(15,23.0005)" id="g76"><path id="path78" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.001,0 c -2,1 -2,-0.448 -2,-1 0,-0.552 0,-1 2,-1 L 0,-2 0,0 Z"/></g><g transform="translate(11.457,30.771)" id="g80"><path id="path82" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.205,0.741 2.409,1.482 4.123,0.045 5.207,-0.863 4.632,-2.132 3.659,-1.9 2.687,-1.668 1.714,-1.437 0.509,-2.177 -0.695,-2.918 -1.205,-0.741 0,0"/></g><g transform="translate(1.9995,21)" id="g84"><path id="path86" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.266,0 -0.487,0.209 -0.499,0.477 -0.013,0.276 0.201,0.51 0.477,0.522 L 10.977,1.5 c 0.281,0.021 0.51,-0.201 0.522,-0.477 0.013,-0.275 -0.2,-0.509 -0.476,-0.522 L 0.023,0 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="M28.721 12.849s3.809 1.643 5.532.449c1.723-1.193 2.11-2.773 1.159-4.736-.951-1.961-3.623-2.732-3.712-5.292 0 0-.298 4.141 1.513 5.505 2.562 1.933-.446 4.21-3.522 3.828-3.078-.382-.97.246-.97.246z"/><path fill="#8A4B38" d="M23.875 19.375s-.628 2.542.187 5.03c.145.341.049.556-.208.678-.256.122-4.294 1.542-4.729 1.771-.396.208-1.142 1.78-1.208 2.854.844.218 1.625.104 1.625.104s.025-1.915.208-2.042c.183-.127 5.686-1.048 6.062-1.771s1.611-3.888.812-5.292c-.225-.395-.637-1.15-.637-1.15l-2.112-.182z"/><path fill="#292F33" d="M17.917 29.708s-.616 1.993.008 2.138c.605.141 1.694-.388 1.755-.646.081-.343.216-1.179.098-1.366-.118-.186-1.861-.126-1.861-.126z"/><path fill="#8A4B38" d="M11.812 21.875l-.75-2.562s-2.766 2.105-3.938 3.594c-.344.437-1.847 3.198-1.722 4.413.05.488.474 2.583.474 2.583l1.651-.465s-1.312-1.896-1.021-2.562c1.428-3.263 5.306-5.001 5.306-5.001z"/><path fill="#292F33" d="M7.679 29.424c-.172-.139-1.803.479-1.803.479s.057 2.085.695 2.022c.618-.061 1.48-.912 1.455-1.175-.034-.351-.175-1.187-.347-1.326z"/><path fill="#C1694F" d="M27.188 11.188c-3.437.156-7.207.438-9.5.438-3.655 0-5.219-1.428-6.562-2.625C8.838 6.964 8.167 4.779 6 5.501c0 0-.632-.411-1.247-.778l-.261-.152c-.256-.148-.492-.276-.656-.347-.164-.072-.258-.087-.228-.01.019.051.093.143.236.286.472.472.675.95.728 1.395-2.01 1.202-2.093 2.276-2.871 3.552-.492.807-1.36 2.054-1.56 2.515-.412.948 1.024 2.052 1.706 1.407.893-.845.961-1.122 2.032-1.744.983-.016 1.975-.416 2.308-1.02 0 0 .938 2.083 1.938 3.583s2.5 3.125 2.5 3.125c-.131 1.227.12 2.176.549 2.922-.385.757-.924 1.807-1.417 2.745-.656 1.245-1.473 3.224-1.208 3.618.534.798 2.719 2.926 4.137 3.311 1.03.28 2.14.437 2.14.437l-.193-1.574s-1.343.213-1.875-.083c-1.427-.795-2.666-2.248-2.708-2.542-.07-.487 3.841-2.868 5.14-3.645 2.266.097 6.022-.369 8.626-1.702.958 1.86 2.978 2.513 2.978 2.513s.667 2.208 1.375 4.125c-1.017.533-4.468 3.254-4.975 3.854-.456.54-.856 2.49-.856 2.49.82.375 1.57.187 1.57.187s.039-1.562.385-2.073c.346-.511 4.701-2.559 5.958-3.458.492-.352.404-.903.262-1.552-.321-1.471-.97-4.781-.971-4.782 5.146-2.979 6.458-11.316-2.354-10.916z"/><path fill="#292F33" d="M22.336 33.782s-.616 1.993.008 2.138c.605.141 1.694-.388 1.755-.646.081-.343.216-1.179.098-1.366-.118-.187-1.861-.126-1.861-.126zm-7.676-5.296c-.167.146.164 1.859.164 1.859s2.064.299 2.111-.34c.045-.62-.647-1.614-.91-1.634-.351-.027-1.198-.031-1.365.115z"/><path fill="#FFAC33" d="M25.103 11.282c-3.295.135-9.103.499-10.4-.079.063 1.922-.676 3.605.3 6.865.46.101 8.122.244 10.935-.912-.672-2.862-.389-3.993-.835-5.874z"/><path fill="#623120" d="M15.891 11.438s-.759 3.543 2.408 3.63 2.792-2.247 3.045-2.505 2.718-.391 2.718-1.064c0-.233-1.269-.127-1.874-.099-.303.014-3.589.204-6.297.038z"/><path fill="#5C913B" d="M6.094 5.706c-.682.47-1.67.286-1.67.286-.594.25-1.524 1.156-1.93 1.937S.969 10.593.969 10.593s1.094.865 1.719 1.906c0 0 .531-.531 1.192-.875 1.942-.063 2.308-1.02 2.308-1.02s.031-2.992-.094-4.898zM4.321 8.467c-.253 0-.46-.206-.46-.459s.207-.459.46-.459.459.206.459.459-.206.459-.459.459z"/><circle fill="#292F33" cx="4.25" cy="8.047" r=".349"/><path fill="#F5F8FA" d="M4.321 7.099c-.502 0-.909.408-.909.909s.407.909.909.909c.501 0 .908-.408.908-.909s-.407-.909-.908-.909zm0 1.368c-.253 0-.46-.206-.46-.459s.207-.459.46-.459.459.206.459.459-.206.459-.459.459zm-1.785 4.185L.765 10.9l.253-.388 1.841 1.817zm3.568-6.953l.449-.009.093 4.898-.449.009z"/><path fill="#292F33" d="M12.655 9.07c1.773 1.446 3.147.322 3.147.322-1.295-.271-2.056-.867-2.708-1.562.835-.131 1.287-.666 1.287-.666-1.061-.013-1.824-.3-2.485-.699-.565-.614-1.233-1.202-2.254-1.631-.294-.125-.606-.21-.922-.276-.086-.025-.178-.063-.258-.073-.906-.114-1.845.051-2.737.603-.322.2-.214.639.117.623 1.741-.085 2.866.582 3.47 1.633 2.169 3.772 5.344 3.875 5.344 3.875s-1.29-.688-2.001-2.149zm5.11 13.33l-.361-7.566 1.029.228.45 7.208c-.377.071-1.118.13-1.118.13z"/><path fill="#623120" d="M2.354 12.75c-.191 0-.374-.11-.457-.296-.112-.252.001-.548.254-.66C8.29 9.058 13.369 9.059 13.628 9.047c.275.001.498.226.497.502-.001.275-.226.498-.5.498h-.004c-.104 0-5.15.025-11.063 2.66-.066.029-.135.043-.204.043z"/><path fill="#F2D1A1" d="M18.875 5.516c-.438-1.469-3.256-1.231-3.077-2.591l-.121.243c-.028-.207-.079-.416-.171-.62-.45-.997-1.522-1.486-2.394-1.092-.756.341-1.738.349-1.341 1.636.061.197.134.451.248.703.452.996 1.849 1.665 2.722 1.271.05-.022.091-.055.137-.082.207.123.84.506 1.864 1.205 1.207.823 2.568.797 2.133-.673z"/><path fill="#FFE51E" d="M11.889 1.419c.256-.5 1.301-1.065 2.192-1.01 1.005.063 1.564.76 1.795 1.633.114.43.045.914-.043 1.27 0 0-.965-.087-.858-.15.198-.117.034-.815-.218-.907-.265-.097-.361.163-.324.364.036.201.032.324-.08.398s-.489-.502-.765-.614c-.455-.185-1.491 1.132-1.816.69-.202-.276-.2-1.055.117-1.674z"/><path fill="#9266CC" d="M13.163 2.849s1.582-.754 1.988-.869.603-.166.671-.252c.067-.086-.103-.225-.178-.316s-.44-.974-1.275-1.243c-.696-.224-1.202-.111-1.583.045s-1.184.512-1.366 1.842c-.096.745.038 1.145.038 1.145s-.476.136-.523.144c-.047.008-.042.126.179.181.221.055 1.292-.068 1.64-.231s.318-.371.409-.446z"/><path d="M20.828 14.172c-.186-.532-.248-.716-.554-1.524-.1-.264-.219-.585-.369-.993l-1.934.745c.176.383.313.688.426.946.364.832.475 1.321.592 1.877l-.801.291c-.387.168-.811.333-.858.933-.036.462.341.424.635.388.433-.052 3.093-.506 3.223-.788.117-.257-.139-1.243-.36-1.875z"/><path fill="#CCD6DD" d="M17.971 12.4s-.2-.506-.395-1.169c-.376-1.282-.565-2.314 3.451-3.335-.024-.042-.056-.092-.099-.152-1.324-1.858-4.253-3.696-3.491-3.815 3.832-.601 5.007-.007 6.684 2.349.827 1.162.936 1.593.784 2.191-.59 2.328-5.15 1.272-5 3.186l-1.934.745z"/><path fill="#5C913B" d="M17.439 7.086c1.535 1.055 2.339-.154 3.588.81l3.277-1.322c-1.281-2.465-4.879-4.553-7.86-3.024-.693.355-1.185 1.024-1.041 1.804.289 1.56 1.405 1.299 2.036 1.732z"/><path fill="#A6D388" d="M17.937 5.153c-.031-.08-.117-.287-.179-.356-.3-.419-.842-.609-1.34-.406-.583.238-.864.903-.626 1.487.924 2.413 1.142 2.651 1.032 2.839-.03.03-.348.284-2.323.09L14 9v1l.305.797c1.924.189 3.359.114 4.107-.865.879-1.152.428-2.421-.475-4.779z"/><path fill="#F2D1A1" d="M14.502 8.807c-1.893-1.191-2.035.25-2.089.799-.054.55-.098.995 1.893 1.191l.196-1.99z"/><path fill="#AAB8C2" d="M18.273 15.478l.447-.159c-.488-1.218-1.031-1.021-1.071-1.006-.2.076-.925 1.053-.316 2.516.039.093.126.15.22.154.036.002.073-.005.107-.019.127-.054.188-.199.135-.327-.373-.896-.142-1.651.031-1.725.172-.073.411.302.447.566z"/></svg> \ No newline at end of file |