Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.
2020-07-22 13:38:17 +02:00
..
2019-11-13 23:02:10 +01:00
2018-06-29 15:34:36 +02:00
2019-11-13 23:02:10 +01:00
2018-03-24 13:06:27 +01:00
2018-02-28 06:54:55 +01:00
2018-04-17 15:23:46 +02:00
2018-03-24 13:06:27 +01:00