You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
assets.rake	…
auto_annotate_models.rake	…
db.rake	…
emojis.rake	Update emoji codepoint mappings to v11.0 (#9618)	6 years ago
glitchsoc.rake	…
mastodon.rake	Add config of multipart threshold for S3 (#11924)	5 years ago
repo.rake	Add missing locale file for ga and add rake task to check for it (#11813)	5 years ago
statistics.rake	…