This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	Override current_user when generating static pages	2018-12-19 20:49:58 +01:00
auto_annotate_models.rake	…
db.rake	…
emojis.rake	Update emoji codepoint mappings to v11.0 (#9618)	2018-12-24 19:12:00 +01:00
glitchsoc.rake	…
mastodon.rake	Add config of multipart threshold for S3 (#11924)	2019-09-23 15:37:45 +02:00
repo.rake	Add missing locale file for ga and add rake task to check for it (#11813)	2019-09-12 04:58:33 +02:00
statistics.rake	…