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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f9d8-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f9d8-1f3ff-200d-2640-fe0f.svg
index ab672b006..5cc0fb7d4 100644
--- a/public/emoji/1f9d8-1f3ff-200d-2640-fe0f.svg
+++ b/public/emoji/1f9d8-1f3ff-200d-2640-fe0f.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#7C533E" d="M5.001 28c-.367 0-.72-.202-.896-.553-.247-.494-.047-1.095.447-1.342l5.544-2.772.917-5.498c.091-.544.605-.913 1.151-.822.544.091.913.606.822 1.151l-1 6c-.053.315-.253.587-.539.73l-6 3c-.143.072-.296.106-.446.106zm25.998 0c-.15 0-.303-.034-.446-.105l-6-3c-.286-.144-.486-.415-.539-.73l-1-6c-.091-.545.277-1.06.822-1.151.543-.09 1.061.277 1.15.822l.916 5.498 5.545 2.772c.494.247.694.848.447 1.342-.175.35-.528.552-.895.552z"/><path fill="#4289C1" d="M13 27.25h10v4.5H13z"/><path fill="#0B0200" d="M19 0c-1.264 0-2.435.393-3.402 1.061C15.402 1.031 15.205 1 15 1c-2.209 0-4 1.791-4 4v4c0 3.866 3.134 7 7 7s7-3.134 7-7V6.001C25 2.687 22.314 0 19 0z"/><path fill="#9268CA" d="M23 15H13c-2.562 0-2.458 4-2.458 4H13v9h10v-9h2.458s.104-4-2.458-4z"/><path fill="#7C533E" d="M16 11v4c0 1.104.896 2 2 2s2-.896 2-2v-4h-4z"/><path fill="#7C533E" d="M16 3s-.011 3.285-3 3.894V9c0 2.762 2.238 5 5 5s5-2.237 5-5V6.968C16.019 6.644 16 3 16 3z"/><path fill="#DF1F32" d="M20 12h-4s0 1 2 1 2-1 2-1z"/><circle cx="15.5" cy="8.5" r=".5"/><circle cx="20.5" cy="8.5" r=".5"/><path fill="#3D2E24" d="M17 10h2s0 1-1 1-1-1-1-1z"/><path fill="#7C533E" d="M8.418 34.556c.308.769 1.181 1.142 1.95.834l12.395-3.803s3.49.701 3.351-1.294c-.106-1.52-2.586-2.245-4.467-1.491-1.881.754-12.395 3.803-12.395 3.803-.769.309-1.143 1.182-.834 1.951z"/><path fill="#664131" d="M25.756 30.608c-.212-.689-2.021-.422-2.456-.303-.435.12-12.47 3.844-13.453 4.16-.924.296-.364 1.06.087 1.026.033-.008.066-.01.099-.02L21.8 31.884c.877-.274 1.884-.166 2.719-.244.396-.037.802-.167.877-.202.167-.075.511-.34.36-.83z"/><path fill="#7C533E" d="M27.583 34.556c-.308.769-1.181 1.142-1.95.834l-12.395-3.803s-3.49.701-3.351-1.294c.106-1.52 2.586-2.245 4.467-1.491 1.881.754 12.395 3.803 12.395 3.803.769.309 1.142 1.182.834 1.951z"/><path fill="#664131" d="M10.244 30.608c.212-.689 2.021-.422 2.456-.303.435.12 12.47 3.844 13.453 4.16.924.296.364 1.06-.087 1.026-.033-.008-.066-.01-.099-.02L14.2 31.884c-.877-.274-1.884-.166-2.719-.244-.396-.037-.802-.167-.877-.202-.166-.075-.511-.34-.36-.83z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M28.632 30.563c-.178-1.426-1.568-1.931-2.257-1.931-.884 0-2.992 1.106-3.375-.585l-.037-.183-9.91-.012-.053.184c-.375 1.708-2.492.596-3.378.596-.689 0-2.079.505-2.257 1.931C7.365 30.563 14.13 33 18 33c3.873 0 10.632-2.437 10.632-2.437z"/><path fill="#7C533E" d="M12.165 17.014c-.546-.091-1.06.278-1.151.822l-.825 4.947c-.071.043-.142.087-.217.135-1.762 1.131-1.661 3.529-2.934 4.616-.171.146-.949.766-1.203 1.325-.336.738.22.444.045.695-.406.584-.414 1.478-.127 1.686l.373.1c.557.403 2.081-1.336 2.281-2.302.3-1.443 3.075-3.25 3.589-4.653.162-.444.224-.787.173-1.074l1.106-5.145c.091-.546-.566-1.062-1.11-1.152zm17.922 12.598c-.175-.251.437-.016.101-.754-.255-.56-1.089-1.179-1.259-1.325-1.273-1.087-1.116-3.485-2.878-4.616-.083-.054-.164-.104-.243-.151l-.822-4.93c-.09-.544-.607-.912-1.15-.822-.545.091-1.235.606-1.145 1.151l1.151 5.222c-.028.272.036.592.184.998.513 1.402 3.289 3.209 3.589 4.653.201.967 1.725 2.706 2.281 2.302l.373-.1c.289-.21.225-1.044-.182-1.628z"/><path fill="#7C533E" d="M22.757 35.82c-1.04.089-2.02-.208-3 0-.475.03-.802 0-1.277-.416s-8.287-1.515-9.713-2.465c-.658-.439-1.662-1.54-1.396-2.465.263-.913 1.139-1.429 2.198-1.455 2.065-.051 6 2.941 8.851 4.04.518.2.948-.052 1.604.119.683.178 2.317-.555 3.149-.446 1.129.149 1.574.683 1.485 1.604-.094.974-.861 1.395-1.901 1.484z"/><path fill="#664131" d="M22.757 35.82c-1.04.089-2.02-.208-3 0-.475.03-.802 0-1.277-.416s.889-2.399 1.545-2.228c.683.178 2.317-.555 3.149-.446 1.129.149 1.574.683 1.485 1.604-.095.976-.862 1.397-1.902 1.486zm-11.561-2.614c.238-.624 1.188-.891 1.634-.95s1.188.208 1.693.416c.505.208 1.118.234 1.504.085.386-.149.668-.124.958 0 .078.033.423 0 .546-.067 0 0 1.79.616 1.136.824-.653.208-5.421.524-6.074.524s-1.397-.832-1.397-.832z"/><path fill="#664131" d="M7.371 30.474c.006-.02.016-.037.022-.056.201.762.76 1.66 1.401 1.898.802.297 7.247 2.198 8.049 2.287.802.089 1.99.208 2.228.386.238.178.861.238 1.366.119.505-.119 1.782.356 2.436.208.653-.148 1.604-.445 1.782-1.247.003-.015.007-.022.011-.034.004.096.003.195-.007.302-.094.975-.861 1.396-1.901 1.485s-2.02-.208-3 0c-.475.03-.802 0-1.277-.416-.475-.416-8.287-1.515-9.713-2.465-.659-.441-1.663-1.543-1.397-2.467z"/><path fill="#7C533E" d="M13.243 35.82c1.04.089 2.02-.208 3 0 .475.03.802 0 1.277-.416s8.287-1.515 9.713-2.465c.658-.439 1.662-1.54 1.396-2.465-.263-.913-1.139-1.429-2.198-1.455-2.065-.051-6 2.941-8.851 4.04-.518.2-.948-.052-1.604.119-.683.178-2.317-.555-3.149-.446-1.129.149-1.574.683-1.485 1.604.094.974.861 1.395 1.901 1.484z"/><path fill="#0B0200" d="M19 0c-1.264 0-2.435.393-3.402 1.061C15.402 1.031 15.205 1 15 1c-2.209 0-4 1.791-4 4v4c0 3.866 3.134 7 7 7s7-3.134 7-7V6.001C25 2.687 22.314 0 19 0z"/><path fill="#9268CA" d="M22.543 15h-9.089c-2.562 0-2.912 4-2.912 4l2.458.632s.454 2.376.454 4.337S13 28 13 28s2.031.335 5 .335S23 28 23 28s-.487-2.071-.487-4.061.487-4.307.487-4.307L25.458 19s-.353-4-2.915-4z"/><path fill="#7C533E" d="M16 11v4c0 1.104.896 2 2 2s2-.896 2-2v-4h-4z"/><path fill="#664131" d="M20 11l-4 .019V15s2 1 4 0v-4z"/><path fill="#7C533E" d="M16 3s-.011 3.285-3 3.894V9c0 2.762 2.238 5 5 5s5-2.237 5-5V6.968C16.019 6.644 16 3 16 3z"/><path fill="#DF1F32" d="M20 12h-4s0 1 2 1 2-1 2-1z"/><path fill="#3D2E24" d="M16.25 8.75h-1.5c-.137 0-.25-.113-.25-.25s.113-.25.25-.25h1.5c.138 0 .25.113.25.25s-.112.25-.25.25zm5 0h-1.5c-.138 0-.25-.113-.25-.25s.112-.25.25-.25h1.5c.138 0 .25.113.25.25s-.112.25-.25.25zM17 10h2s0 1-1 1-1-1-1-1z"/></svg>
\ No newline at end of file