01eaeab56d
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system. |
||
|---|---|---|
| .. | ||
| exports | ||
| migration | ||
| preferences | ||
| two_factor_authentication | ||
| aliases_controller.rb | ||
| applications_controller.rb | ||
| base_controller.rb | ||
| deletes_controller.rb | ||
| exports_controller.rb | ||
| featured_tags_controller.rb | ||
| flavours_controller.rb | ||
| identity_proofs_controller.rb | ||
| imports_controller.rb | ||
| migrations_controller.rb | ||
| preferences_controller.rb | ||
| profiles_controller.rb | ||
| sessions_controller.rb | ||
| two_factor_authentications_controller.rb | ||