Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
..
2019-07-30 11:10:46 +02:00
2018-10-07 23:44:58 +02:00
2017-03-02 18:49:32 +01:00