djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-28 19:10:22 -05:00
Code Issues Packages Projects Releases Wiki Activity
2cfa142961
tootlab-mastodon/app/controllers/oauth
History
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