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/1f468-1f3fc-200d-1f680.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/1f468-1f3fc-200d-1f680.svg')
-rw-r--r-- | public/emoji/1f468-1f3fc-200d-1f680.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f468-1f3fc-200d-1f680.svg b/public/emoji/1f468-1f3fc-200d-1f680.svg index 523fe1c98..b1567a688 100644 --- a/public/emoji/1f468-1f3fc-200d-1f680.svg +++ b/public/emoji/1f468-1f3fc-200d-1f680.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,0 36,0 36,36 0,36 0,0 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,0)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(30.2119,7.9297)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.505 -3.676,-2.726 -8.212,-2.726 -4.535,0 -8.212,1.221 -8.212,2.726 0,1.505 3.677,2.727 8.212,2.727 C -3.676,2.727 0,1.505 0,0"/></g><g transform="translate(22,5.2041)" id="g28"><path id="path30" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 4.536,0 8.212,1.22 8.212,2.727 8.212,2.746 8.204,2.765 8.203,2.786 8.135,2.788 8.068,2.796 8,2.796 l -16,0 c -0.068,0 -0.135,-0.008 -0.203,-0.01 C -8.204,2.765 -8.212,2.746 -8.212,2.727 -8.212,1.22 -4.535,0 0,0"/></g><g transform="translate(30.9336,8)" id="g32"><path id="path34" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.306,0 -0.858,0 c 0.014,0 0.029,-0.065 0.029,-0.127 0,-1.36 -3.491,-2.434 -7.799,-2.434 -4.307,0 -7.798,1.06 -7.798,2.42 0,0.062 0.015,0.141 0.029,0.141 l -0.734,0 -0.705,-0.099 0.005,-1.018 c 0.114,-2.405 4.186,-3.392 9.203,-3.392 4.998,0 9.054,1.009 9.2,3.413 L 0.28,-0.122 0,0 Z"/></g><g transform="translate(22,5.4668)" id="g36"><path id="path38" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.307,0 -7.799,1.104 -7.799,2.464 0,1.359 3.492,2.463 7.799,2.463 4.307,0 7.799,-1.104 7.799,-2.463 C 7.799,1.104 4.307,0 0,0 m 0,5.901 c -5.089,0 -9.214,-1.539 -9.214,-3.437 0,-1.9 4.125,-3.44 9.214,-3.44 5.089,0 9.214,1.54 9.214,3.44 0,1.898 -4.125,3.437 -9.214,3.437"/></g><g transform="translate(17.6396,8.0625)" id="g40"><path id="path42" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.267 2.848,-1.511 4.36,-1.511 1.512,0 2.616,0.245 4.36,1.511 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(17.6318,10.0273)" id="g44"><path id="path46" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(15.4443,20.0645)" id="g48"><path id="path50" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(31.833,20.0645)" id="g52"><path id="path54" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(13.4775,19.0405)" id="g56"><path id="path58" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.523,10.121 4.707,0 8.522,-4.532 8.522,-10.121 0,-5.589 -3.815,-10.121 -8.522,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(22,12.1982)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.705 -3.741,0.848 -0.256,0.256 -0.256,0.671 0,0.927 0.248,0.248 0.645,0.254 0.902,0.023 C -2.787,1.761 -2.118,1.311 0,1.311 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.499,2.044 3.755,1.786 4.011,1.53 3.997,1.104 3.741,0.848 3.6,0.705 2.754,0 0,0"/></g><g transform="translate(22,32.5205)" id="g64"><path id="path66" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-4.168 9.178,-7.641 0,-3.473 -0.706,-4.863 -1.412,-3.473 -0.706,1.389 -1.412,2.778 -1.412,2.778 0,0 -4.236,0 -5.648,1.39 0,0 2.118,-4.168 -2.118,0 0,0 0.706,-2.779 -3.53,0.694 0,0 -2.118,-1.389 -2.824,-4.862 -0.196,-0.964 -1.412,0 -1.412,3.473 C -9.178,-4.168 -6.354,0 0,0"/></g><g transform="translate(18,19)" id="g68"><path id="path70" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(26,19)" id="g72"><path id="path74" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22.75,16.25)" id="g76"><path id="path78" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(33,3)" id="g80"><path id="path82" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3 3,0 0,2 C 3,-0.659 2.965,-0.326 2.91,0 L 0,0 Z"/></g><path id="path84" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,0 -2,0 0,2 2,0 0,-2 z"/><g transform="translate(24.0039,0)" id="g86"><path id="path88" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.198,5.146 -6.048,9 -11.857,9 -17.666,9 -22.515,5.146 -23.713,0 L 0,0 Z"/></g><g transform="translate(22.6689,0)" id="g90"><path id="path92" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.173,4.464 -5.432,7.778 -10.522,7.778 -15.611,7.778 -19.871,4.464 -21.044,0 L 0,0 Z"/></g><g transform="translate(21.6377,0)" id="g94"><path id="path96" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.148,3.937 -4.956,6.833 -9.49,6.833 -4.534,0 -8.343,-2.896 -9.491,-6.833 L 0,0 Z"/></g><g transform="translate(18.1953,0.9512)" id="g98"><path id="path100" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.103,0.063 C 0.87,0.53 1.03,1.602 0.402,2.245 -0.064,2.726 -0.59,3.154 -1.164,3.513 -1.724,3.862 -2.321,4.134 -2.947,4.34 -3.775,4.612 -4.658,4.107 -4.813,3.248 -4.933,2.588 -4.588,1.902 -3.958,1.671 -3.093,1.353 -2.331,0.844 -1.727,0.197 -1.284,-0.275 -0.553,-0.336 0,0"/></g><g transform="translate(6.3442,21.7378)" id="g102"><path id="path104" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.542,0.571 -0.6,2.2 c -0.079,0.29 -0.343,0.491 -0.644,0.491 -0.3,0 -0.564,-0.201 -0.643,-0.491 l -0.6,-2.2 L -5.571,0 c -0.262,-0.096 -0.435,-0.346 -0.435,-0.625 0,-0.279 0.173,-0.529 0.435,-0.625 l 1.534,-0.568 0.605,-2.415 c 0.074,-0.296 0.341,-0.505 0.646,-0.505 0.306,0 0.573,0.209 0.647,0.505 L -1.534,-1.818 0,-1.25 c 0.262,0.096 0.435,0.346 0.435,0.625 C 0.435,-0.346 0.262,-0.096 0,0"/></g><g transform="translate(11.2798,31.3662)" id="g106"><path id="path108" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.61,0.966 -0.966,2.61 c -0.16,0.433 -0.573,0.72 -1.035,0.72 -0.461,0 -0.874,-0.287 -1.035,-0.72 L -6.612,0.966 -9.221,0 c -0.434,-0.161 -0.721,-0.573 -0.721,-1.035 0,-0.462 0.287,-0.874 0.721,-1.035 l 2.609,-0.966 0.966,-2.61 c 0.161,-0.433 0.574,-0.72 1.035,-0.72 0.462,0 0.875,0.287 1.035,0.72 L -2.61,-3.036 0,-2.07 c 0.433,0.161 0.72,0.573 0.72,1.035 C 0.72,-0.573 0.433,-0.161 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M36 36v-2c0-3.314-2.686-6-6-6H14c-3.313 0-6 2.686-6 6v2h28z"/><path fill="#EA596E" d="M29.799 28.127c0 1.36-3.491 2.434-7.799 2.434s-7.798-1.06-7.798-2.42c0-.062.015-.141.029-.141h-.734l-.705.099.005 1.019c.114 2.405 4.186 3.392 9.204 3.392 4.997 0 9.054-1.009 9.199-3.413l.015-.974c-.001-.001-1.416-.058-1.416.004z"/><path fill="#BE1931" d="M22 24.632c-5.089 0-9.214 1.539-9.214 3.438 0 1.899 4.125 3.439 9.214 3.439s9.214-1.54 9.214-3.439-4.125-3.438-9.214-3.438"/><path fill="#292F33" d="M22 30.533c-4.307 0-7.799-1.104-7.799-2.464 0-1.359 3.492-2.463 7.799-2.463s7.799 1.104 7.799 2.463c0 1.361-3.492 2.464-7.799 2.464"/><path fill="#F3D2A2" d="M17.64 27.938c1.744 1.267 2.848 1.511 4.36 1.511 1.512 0 2.615-.245 4.359-1.511v-3.812h-8.72v3.812z"/><path fill="#E2C196" d="M17.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.146-.373 4.363-1.746v-3.491h-8.728v3.491z"/><path fill="#F3D2A2" d="M15.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#F3D2A2" d="M13.477 16.959c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S26.707 27.08 22 27.08c-4.706 0-8.523-4.531-8.523-10.121"/><path fill="#C1694F" d="M22 23.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.646-.255.902-.023.052.037.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.256-.255.657-.243.913.015.256.256.242.683-.014.938-.141.143-.987.848-3.741.848"/><path fill="#FFE51E" d="M22 3.48c5.648 0 9.178 4.168 9.178 7.641s-.706 4.863-1.412 3.473l-1.412-2.778s-4.235 0-5.647-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118 1.389-2.824 4.862-.196.964-1.412 0-1.412-3.473C12.822 7.648 15.646 3.48 22 3.48"/><path fill="#662113" d="M18 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#C1694F" d="M22.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#55ACEE" d="M33 33v3h3v-2c0-.341-.035-.674-.09-1H33z"/><path fill="#FFCC4D" d="M34 34h2v2h-2z"/><path fill="#E1E8ED" d="M24.004 36c-1.198-5.146-6.048-9-11.857-9C6.338 27 1.489 30.854.291 36h23.713z"/><path fill="#292F33" d="M22.669 36c-1.173-4.464-5.432-7.778-10.522-7.778-5.089 0-9.349 3.314-10.522 7.778h21.044z"/><path fill="#FFAC33" d="M21.638 36c-1.148-3.937-4.956-6.833-9.49-6.833S3.805 32.063 2.657 36h18.981z"/><path fill="#FFDC5D" d="M18.195 35.049l.103-.063c.767-.467.928-1.538.3-2.182-.467-.48-.993-.909-1.566-1.268-.56-.35-1.158-.621-1.784-.827-.828-.272-1.711.232-1.866 1.092-.119.66.225 1.346.855 1.577.865.318 1.627.827 2.232 1.474.442.472 1.173.533 1.726.197"/><path fill="#9266CC" d="M6.344 14.262l-1.542-.571-.6-2.2c-.079-.29-.343-.491-.644-.491-.3 0-.564.201-.643.491l-.6 2.2-1.542.571c-.262.096-.435.346-.435.625s.173.529.435.625l1.534.568.605 2.414c.074.297.341.506.646.506.306 0 .573-.209.647-.505l.605-2.414 1.534-.568c.262-.096.435-.346.435-.625 0-.28-.173-.53-.435-.626"/><path fill="#5DADEC" d="M11.28 4.634l-2.61-.966-.966-2.61c-.16-.433-.573-.72-1.035-.72-.461 0-.874.287-1.035.72l-.966 2.61-2.609.966c-.434.161-.722.573-.722 1.035 0 .462.287.874.721 1.035l2.609.966.966 2.61c.161.433.575.72 1.035.72.462 0 .875-.287 1.035-.72l.966-2.61 2.61-.966c.433-.161.721-.573.721-1.035 0-.462-.288-.874-.72-1.035"/></svg> \ No newline at end of file |