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	…
devise	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
paperclip	…
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
templates	…
cli.rb	…