diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
tree | a8a0df2129a863a739dda6399352d64af811110e /public/emoji/1f938-1f3fc.svg | |
parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'public/emoji/1f938-1f3fc.svg')
-rw-r--r-- | public/emoji/1f938-1f3fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f938-1f3fc.svg b/public/emoji/1f938-1f3fc.svg index 70941c652..15b2df731 100644 --- a/public/emoji/1f938-1f3fc.svg +++ b/public/emoji/1f938-1f3fc.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F3D2A2" 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="#F3D2A2" 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="#F3D2A2" 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="#F3D2A2" 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="#F3D2A2" 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="#F3D2A2" 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="#FFE51E" 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="#F3D2A2" 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="#F3D2A2" 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 +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F3D2A2" d="M20.533 30.046c-.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="#FFE51E" d="M21.25 31.724s.75.742-.372 1.669c-.925.764-1.932-.128-2.909-.018-.737.083-1.357.5-1.584 1.086 0 0 .092-1.121.564-1.852.613-.949 1.827-1.457 2.52-1.538 1.081-.125 1.781.653 1.781.653z"/><path fill="#F3D2A2" d="M21.251 24.544l1.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-.436-2.134c-.142-.22 5.374-2.71 5.745-3.124.001.001.492 1.327-1.395 2.407z"/><path fill="#F3D2A2" d="M26.857 21.431l-4.341.033c-.516.004-.934.428-.931.943.004.515.43.935.945.93l4.342-.031c.516-.004.934-.429.931-.944-.005-.515-.43-.934-.946-.931z"/><path fill="#F3D2A2" d="M30.852 22.974c-.743-.149-3.178-1.455-3.772-1.485-.594-.03-.799.189-.965.679-.166.486.223.747 1.025 1.311.802.564 2.911.505 3.386.624.135.034.398.385.653.505.505.238.833-.071 1.129-.059.442.018.76.209.832 0l.148-.267c.119-.416-.471-.753-1.069-1.129-.303-.191-1.117-.129-1.367-.179z"/><path fill="#FFE51E" d="M24.843 27.05s.619.395 1.155.82c.612.487.614 1.832.235 2.857-.297.799-1.645 1.946-2.986 2.11-1.516.185-2.541-.699-3.126-1.936-.538-1.137-.218-2.679-.218-2.679s.947.638.805.762c-.264.229.176 1.224.576 1.291.421.071.492-.343.383-.631-.11-.289-.43-1.104-.43-1.104s.571.914 1.01 1.02c.439.106 1.565-.768 2.893.09 0 0 .283-.416.271-1.092-.011-.557-.568-1.508-.568-1.508z"/><path fill="#F3D2A2" d="M21.078 8.847c-.168.504-.728.966-.91 1.143-.822.803-2.415 2.375-3.194 2.938l2.622 2.15c.571-.547 1.504-1.719 2.309-2.726.48-.6.976-.907 1.274-1.816 0 0 .668-3.441 1.67-6.022.32-.825-1.304-1.405-1.67-.718-.363.681-.824 1.654-1.063 2.295-.162.439-.962 2.528-1.038 2.756z"/><path fill="#BE1931" d="M23.011 2.446c-.055.164-.202.758-.202.984l-.24 1.347c-.014.067.032.132.099.142.197.031.834-.084 1.225.272.262.238.292.663.443.728.048.02.102-.005.119-.054 0 0 .048-.246.11-.456.13-.166.283-.5.519-.634.14-.024.291-.151.66-.174.219-.014 1.224-.085 1.224-.085.255-.014.335-.093.472-.102.282-.02 1.02.002 1.26-.017.239-.018.374-.165.423-.292.048-.126.035-.208.035-.208s-.233-.403-1.596-.956c-.8-.324-4.189-1.074-4.189-1.074l-.127.1c-.125.1-.177.307-.235.479z"/><path fill="#CCD6DD" d="M25.017 4.972c-.007.028-.021.055-.041.078-.066.072-.177.078-.249.012l-.229-.208c-.073-.066-.076-.179-.012-.249.066-.072.177-.078.249-.012l.229.208c.049.044.067.11.053.171z"/><path fill="#DD2E44" d="M25.098 2.587c-.133.188-.556.591-.925.646-.332.05-1.174-.059-1.334-.08.036-.26.144-.649.185-.772.055-.162.131-.375.255-.467.013-.009 1.365.52 1.819.673z"/><path fill="#CCD6DD" d="M23.26 1.913s.14.035.221.123c.081.089.308.19.481.248.173.058.82.288 1.291.379.471.091 1.349.142 1.633.201.284.059.72.167 1.031.302.31.135.585.266.751.357.215.116.382.245.491.374 0 0 .061-.375-.419-.784-.38-.323-.765-.544-1.159-.684-.03-.011-1.085-.357-1.613-.528-.386-.124-1.001-.327-1.001-.327-.728-.245-1.103-.35-1.253-.351-.027 0-.133-.02-.261.035-.084.035-.286.624-.193.655zm2.321 2.786c-.015.064-.065.116-.134.132-.095.021-.189-.039-.21-.134l-.067-.302c-.02-.097.039-.189.134-.211.095-.021.189.039.21.134l.067.302c.007.027.006.054 0 .079zm.618-.098c-.017.073-.08.13-.159.136-.097.006-.182-.067-.188-.164l-.023-.326c-.007-.101.066-.182.164-.189.097-.006.181.067.188.164l.023.326c0 .019-.001.036-.005.053zm.628-.061c-.019.081-.094.14-.18.135-.097-.004-.172-.087-.167-.185l.015-.299c.007-.104.088-.172.185-.167.097.004.172.087.167.185l-.015.299c-.001.012-.002.022-.005.032z"/><path fill="#F3D2A2" d="M9.959 9.913c.528.627 2.12 1.746 2.296 1.929.858.887 1.814 1.427 2.462 2.275l-2.361 2.434c-.63-.478-1.263-1.253-2.178-2.161-.545-.541-1.597-2.568-2.24-3.238 0 0-1.501-1.862-2.791-4.312-.412-.783.992-1.415 1.578-.903.627.548 1.394 1.44 1.978 2.103.308.35 1.101 1.689 1.256 1.873z"/><path fill="#CCD6DD" d="M3.126 1.742c.72-.945 2.329-.518 2.762.695.291.816.305 2.096.709 2.499.403.404.557 1.034.564 1.244.007.21-.226.356-.443.153 0 0 .587.633-.079.709-.665.075-.213.506-.649.398-.436-.108-.371-.43-.371-.43s.003.777-.318.443c-.321-.335-1.899-2.64-2.247-3.716-.228-.706-.453-1.306.072-1.995z"/><path fill="#BE1931" d="M3.37 1.971c.68-.974 2.206-.218 2.442.615.236.833.295 1.916.699 2.319.403.403.945 1.181.951 1.391.007.21-.308.354-.525.151 0 0 .702.676.036.751-.666.075-.492.662-.928.554-.436-.108-.512-.774-.512-.774s.003.777-.318.443c-.321-.335-1.64-2.454-1.968-3.536s-.197-1.456.123-1.914z"/><path fill="#CCD6DD" d="M5.26 6.328c-.044.049-.058.12-.032.185.037.09.14.133.23.096l1.16-.595c.091-.039.133-.14.096-.231-.037-.09-.14-.133-.23-.096l-1.16.595c-.025.012-.046.027-.064.046zm-.395-.779c-.044.049-.058.12-.032.185.037.09.14.133.23.096l1.09-.48c.091-.039.133-.14.096-.231-.037-.09-.14-.133-.23-.096l-1.09.48c-.025.012-.047.027-.064.046zm-.318-.737c-.059.047-.083.128-.055.202.036.091.138.136.228.1l.974-.415c.094-.037.136-.137.101-.229-.035-.09-.137-.135-.228-.099l-.974.415c-.018.006-.033.015-.046.026zm-.244-.697c-.073.041-.107.13-.079.211.032.092.133.14.224.108l.934-.349c.098-.036.14-.133.108-.225-.032-.092-.133-.14-.224-.108l-.934.35c-.011.003-.02.008-.029.013z"/><path fill="#A0041E" d="M14.549 19.12s-1.718-1.063-2.419-1.602c-.699-.539-2.317-2.941-2.317-2.941s1.985-2.051 3.074-2.762l2.584 1.916 2.391-2.222s2.49.991 3.178 2.139c0 0-1.129 1.842-1.485 2.436-.017.458.008 1.039.238 1.069l-5.244 1.967z"/><path fill="#F3D2A2" d="M14.593 29.239l1.825-3.939c.215-.468.774-.673 1.242-.458.467.217.674.778.457 1.245l-1.822 3.941c-.217.468-.776.674-1.245.457-.467-.217-.672-.777-.457-1.246z"/><path fill="#F3D2A2" d="M14.07 34.202s.297-3.515.386-4.188c.089-.673.599-1.197 1.114-1.146.511.049.75.431.817 1.295.067.863-.959 3.206-.867 4.121.03.297.934.551.683.743-.111.085-.853.164-1.01.148l-.564.03c-.252-.025-.888.031-1.04-.149-.158-.188.454-.593.481-.854z"/><path fill="#DD2E44" d="M18.425 26.836s.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-.523-.51-.771-.794-.691-.791-.6-2.399-.668-2.762 0 0-2.408.956-4.149 1.446-1.348.38-3.291.024-3.291.024.481.655 1.548 1.386 2.272 2.183.707.777 2.285 4.916 1.848 5.403-.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.997-1.441z"/></svg> \ No newline at end of file |