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-06-20 02:52:34 +02:00
2017-11-24 02:05:53 +01:00
2019-07-30 11:10:46 +02:00
2019-07-30 11:10:46 +02:00
2017-12-01 16:40:02 +01:00
2019-08-19 11:40:42 +02:00
2017-11-18 00:16:48 +01:00
2019-09-29 22:58:01 +02:00
2019-06-20 02:52:34 +02:00
2017-01-13 03:24:41 +01:00