Thibaut Girka e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
2019-02-01 16:12:20 +01:00
..
2017-05-08 15:56:00 +02:00
2019-01-08 13:39:49 +01:00
2019-01-20 12:37:58 +01:00
2019-01-20 12:37:58 +01:00
2018-01-28 22:48:09 +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
2019-01-20 12:37:58 +01:00
2019-01-08 13:39:49 +01:00
2019-01-20 12:37:58 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-20 12:37:58 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-20 12:37:58 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-20 12:37:58 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00
2019-01-08 13:39:49 +01:00