mastodon/lib
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
..
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00
paperclip
tasks
templates
cli.rb