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

857 B

Raw Blame History

View Raw