Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
assets.rake	…
auto_annotate_models.rake	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
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	…