Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system. |
||
|---|---|---|
| .. | ||
| authorizations_controller.rb | ||
| authorized_applications_controller.rb | ||
| tokens_controller.rb | ||