Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
assets.rake
auto_annotate_models.rake
db.rake
emojis.rake
glitchsoc.rake
mastodon.rake	Add config of multipart threshold for S3 (#11924)	2019-09-23 15:37:45 +02:00
repo.rake
statistics.rake