mastodon-docker-playground/app/controllers/oauth
Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
2020-01-04 23:04:42 +01:00
..
authorizations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
authorized_applications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
tokens_controller.rb Ensure push subscription is immediately removed when application is revoked (#7548) 2018-05-19 21:05:08 +02:00