Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's
2019-11-07 13:43:56 +01:00
..
2018-10-07 23:44:58 +02:00
2018-10-07 23:44:58 +02:00
2017-11-18 00:16:48 +01:00