Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
2018-12-18 16:55:15 +01:00
..
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2018-01-22 14:20:58 +01:00
2018-02-01 07:33:54 +09:00
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2017-12-08 01:59:44 +01:00
2018-01-28 22:48:09 +09:00
2018-01-09 20:30:28 +09:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-27 13:38:03 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00