mirror of https://github.com/Siphonay/mastodon
444796b69b
Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| schema.rb | ||
| seeds.rb | ||