1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-25 00:53:08 -05:00
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-04-27 03:24:09 +02:00
2019-08-23 22:38:02 +02:00