luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-29 01:53:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/auth
History
Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
..
confirmations_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
registrations_controller.rb
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00