Mastodon

Files

Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

2018-12-15 10:45:53 +01:00

_theme.html.haml

Various fixes

2017-12-04 21:58:10 -08:00

admin.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-26 20:41:43 +02:00

application.html.haml

Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream

2018-10-11 14:12:36 +02:00

auth.html.haml

Merge branch 'master' of https://github.com/tootsuite/mastodon