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-08-17 22:04:15 +02:00
2019-08-17 22:04:15 +02:00
2018-09-29 19:03:33 +02:00
2019-02-02 19:11:38 +01:00
2019-06-20 02:52:34 +02:00