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-09-28 00:55:59 +02:00
2019-09-20 23:05:23 +02:00
2019-09-10 12:43:06 +02:00
2019-09-20 23:05:23 +02:00
2019-09-16 15:11:01 +02:00
2019-10-03 03:36:52 +02:00
2019-10-02 00:46:36 +02:00
2019-10-02 00:46:36 +02:00
2019-09-28 00:55:59 +02:00
2019-09-20 23:05:23 +02:00
2019-10-02 00:46:36 +02:00
2019-10-02 00:46:36 +02:00
2019-10-03 03:36:52 +02:00
2019-09-29 17:10:01 +02:00
2019-10-03 03:36:52 +02:00
2019-09-20 23:05:23 +02:00
2019-09-20 23:05:23 +02:00
2019-10-03 03:36:52 +02:00
2019-09-20 23:05:23 +02:00
2019-10-02 00:46:36 +02:00
2019-09-20 23:05:23 +02:00
2019-09-20 23:05:23 +02:00
2019-09-10 12:43:06 +02:00
2019-09-28 00:55:59 +02:00
2019-09-10 12:43:06 +02:00
2019-09-20 23:05:23 +02:00
2019-09-10 12:43:06 +02:00
2019-09-29 17:10:01 +02:00
2019-09-20 23:05:23 +02:00
2019-09-20 23:05:23 +02:00
2019-10-02 00:46:36 +02:00
2019-09-20 23:05:23 +02:00
2019-09-10 12:43:06 +02:00
2019-10-03 03:36:52 +02:00
2019-09-20 23:05:23 +02:00
2019-10-02 00:46:36 +02:00
2019-09-16 15:11:01 +02:00
2019-09-20 23:05:23 +02:00
2019-09-29 17:10:01 +02:00
2019-09-21 20:04:43 +02:00
2019-09-20 23:05:23 +02:00
2019-09-16 15:11:01 +02:00
2019-10-03 03:36:52 +02:00
2019-10-02 00:46:36 +02:00
2019-09-20 23:05:23 +02:00
2019-09-20 23:05:23 +02:00
2019-09-20 23:05:23 +02:00
2019-09-20 23:05:23 +02:00
2019-10-03 03:36:52 +02:00
2019-09-10 12:43:06 +02:00
2019-09-20 23:05:23 +02:00
2019-09-28 00:55:59 +02:00
2019-10-03 03:36:52 +02:00
2019-09-20 23:05:23 +02:00
2019-09-20 23:05:23 +02:00
2019-09-20 23:05:23 +02:00
2019-09-20 23:05:23 +02:00