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/1f9d6-1f3fe-200d-2640-fe0f.svg b/public/emoji/1f9d6-1f3fe-200d-2640-fe0f.svg
index 6fb5efd1a..935ff3290 100644
--- a/public/emoji/1f9d6-1f3fe-200d-2640-fe0f.svg
+++ b/public/emoji/1f9d6-1f3fe-200d-2640-fe0f.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#D99E82" d="M0 4h36v4H0zm0 8h36v4H0zm0 8h36v4H0zm0 8h36v4H0z"/><path opacity=".75" fill="#E1E8ED" d="M33.47 15.4c-.436-.247-.933-.4-1.47-.4-1.657 0-3 1.343-3 3 0 .061.014.118.018.178-.863.301-1.539.977-1.84 1.84-.06-.004-.117-.018-.178-.018-1.311 0-2.414.846-2.822 2.018C24.118 22.014 12.657 22 11 22c-.395 0-.77.081-1.116.22-.259-.957-.974-1.718-1.902-2.041.004-.061.018-.118.018-.179 0-1.657-1.343-3-3-3-.537 0-1.034.153-1.47.4C2.998 16.561 2.067 16 1 16c-.355 0-.685.081-1 .195V32c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V14c-1.067 0-1.998.561-2.53 1.4z"/><path fill="#60352A" d="M19.329 1c-1.681 0-3.238.523-4.524 1.41-.261-.039-.523-.08-.795-.08C11.072 2.33 9 5.062 9 8v8c0 5.142 3.858 8.939 9 8.939 5.142 0 8.914-4.312 8.998-8.87L27 9c-.083-4.991-3.263-8-7.671-8z"/><path fill="#AF7E57" d="M23 20h-3v-1h-4v1h-3c-1.469 0-3 1-3 3v12l.022-.004c.058.561.516 1.004 1.092 1.004.615 0 1.114-.499 1.114-1.114 0-.084-.03-.159-.048-.237h11.639c-.018.079-.048.153-.048.237 0 .615.499 1.114 1.114 1.114.576 0 1.034-.443 1.092-1.004L26 35V23c0-2-1.531-3-3-3z"/><path fill="#9B6A49" d="M20 19h-4v1s2 1 4 0v-1z"/><path fill="#AF7E57" d="M15 6s-1 3-4 4v3c0 3.674 3.327 6.619 6.999 6.619C21.672 19.619 25 16.674 25 13v-3c-8 0-10-4-10-4z"/><path fill="#DF1F32" d="M21 16h-6s.613 1.552 3 1.552S21 16 21 16z"/><circle fill="#662113" cx="15.145" cy="12.726" r=".726"/><circle fill="#662113" cx="20.855" cy="12.726" r=".726"/><path fill="#915A34" d="M17 14h2s0 1-1 1-1-1-1-1z"/><path fill="#9266CC" d="M12 23h12v13H12z"/><path fill="#CBB7EA" d="M23 36h-4v-9s0-3-2-4h6v13z"/><path fill="#744EAA" d="M24 36h-4v-9s0-3-2-4h6v13z"/><path fill="#744EAA" d="M18 23h-6v1h7.121c-.277-.402-.64-.76-1.121-1z"/><path fill="#9266CC" d="M18.121 24h1c-.277-.402-.64-.76-1.121-1h-1c.481.24.844.598 1.121 1z"/><path fill="#553788" d="M18 23c.481.24.844.598 1.121 1H24v-1h-6z"/><path d="M0 32c0 2.209 1.791 4 4 4h12.816c.112-.314.184-.647.184-1 0-1.657-1.343-3-3-3-.36 0-.7.074-1.019.19.004-.064.019-.125.019-.19 0-1.067-.561-1.998-1.4-2.53.247-.436.4-.933.4-1.47 0-1.657-1.343-3-3-3-.781 0-1.487.306-2.021.796C6.872 24.236 5.587 23 4 23c-1.385 0-2.539.944-2.884 2.22C.77 25.081.395 25 0 25v7zm34-7c-.87 0-1.646.376-2.194.967C31.384 24.821 30.292 24 29 24c-1.657 0-3 1.343-3 3-1.657 0-3 1.343-3 3 0 .537.153 1.034.4 1.47-.839.532-1.4 1.463-1.4 2.53-1.304 0-2.403.837-2.816 2H32c2.209 0 4-1.791 4-4v-6.221C35.468 25.3 34.772 25 34 25z" opacity=".85" fill="#F5F8FA"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><g fill="#E1E8ED"><circle cx="4.5" cy="25.5" r="4.5"/><circle cx="25.5" cy="20.5" r="5.5"/><circle cx="31" cy="26.5" r="5"/><circle cx="12" cy="24" r="5"/><path d="M33 30c-1.657 0-3 1.343-3 3H6c0-1.657-1.343-3-3-3s-3 1.343-3 3 1.343 3 3 3h29v-.184c.314.112.647.184 1 .184 1.657 0 3-1.343 3-3s-1.343-3-3-3z"/><path d="M0 25.5h9V33H0zM20 23h9v4h-9zm11 3.5h5V33h-5z"/></g><path fill="#AF7E57" d="M31 36v-4.5c0-3.314-3.56-5.5-6.875-5.5h-12C8.812 26 5 28.186 5 31.5V36h26z"/><path fill="#60352A" d="M17.945 3.978c4.105 0 10.947 2.053 10.947 10.947 0 8.896 0 10.948-2.053 10.948s-4.79-2.053-8.895-2.053c-4.105 0-6.785 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948.001-8.894 6.844-10.947 10.949-10.947"/><path fill="#AF7E57" d="M14.5 26c1 1.982 2.792 4.5 3.5 4.5s2.512-2.549 3.5-4.5v-3.591h-7V26z"/><path fill="#9B6A49" d="M14.322 24.088c1.022 1.155 2.29 1.468 3.668 1.468 1.379 0 2.647-.312 3.67-1.468v-2.937h-7.338v2.937z"/><path fill="#AF7E57" d="M9.734 14.627c0-5.834 3.676-10.563 8.211-10.563 4.533 0 8.209 4.73 8.209 10.563s-3.676 10.285-8.209 10.285c-4.535 0-8.211-4.452-8.211-10.285"/><path fill="#DF1F32" d="M17.945 22.452c-1.606 0-2.447-.794-2.537-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.961-.007.035.032.551.491 1.576.491 1.038 0 1.555-.473 1.576-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.535.885"/><path fill="#60352A" d="M7.735 17.909c-.021-1-.044-.224-.044-.465 0-3.422 2.053.494 2.053-1.943 0-2.439 1.368-2.683 2.736-4.051.684-.685 2.053-2.026 2.053-2.026s3.421 2.067 6.158 2.067c2.736 0 5.474 1.375 5.474 4.112 0 2.736 2.053-1.584 2.053 1.837 0 .244-.023-.531-.04.469h.719c.006-2 .006-1.924.006-3.202C28.902 5.812 22.06 2.5 17.954 2.5 13.85 2.5 7.007 5.757 7.007 14.652c0 .793-.02 1.257.008 3.257h.72z"/><path fill="#662113" d="M14.608 16.796c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c0 .466-.381.847-.847.847m6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .466-.381.847-.846.847"/><path fill="#915A34" d="M18.836 19.409h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .234-.191.423-.424.423"/><path fill="#9266CC" d="M9.75 31.5V36h11.5v-.5h5v-4z"/><path fill="#A47DE2" d="M19.25 31.5c2 1 2 4 2 4v.5h1v-.5h3v-4h-6z"/><path fill="#744EAA" d="M20.25 31.5c2 1 2 4 2 4v.5h4v-4.5h-6z"/><path fill="#744EAA" d="M20.25 31.5H9.75v1h11.621c-.277-.402-.64-.76-1.121-1z"/><path fill="#9266CC" d="M20.371 32.5h1c-.277-.402-.64-.76-1.121-1h-1c.481.24.844.598 1.121 1z"/><path fill="#553788" d="M20.25 31.5c.481.24.844.598 1.121 1h4.879v-1h-6z"/><path d="M32 28c-2.975 0-5.438 2.168-5.911 5.009C26.058 33.008 26.03 33 26 33c-2.049 0-3.806 1.236-4.578 3H33c1.65 0 3-1.35 3-3v-3.463C34.938 28.584 33.539 28 32 28zm-18.422 8c-.772-1.764-2.529-3-4.578-3-.78 0-1.509.194-2.166.512.098-.322.166-.657.166-1.012C7 30.567 5.433 29 3.5 29 1.738 29 .295 30.306.05 32H0v1c0 1.65 1.35 3 3 3h10.578z" opacity=".7" fill="#FFF"/></svg>
\ No newline at end of file