luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-07 07:28:16 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/auth
History
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
..
confirmations_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
sessions_controller.rb