masto-fe/db
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
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00