luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-01 20:45:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/oauth
History
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
..
authorizations_controller.rb
authorized_applications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-05-19 22:41:10 +02:00
tokens_controller.rb