luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 16:24:00 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/auth
History
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
..
confirmations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
omniauth_callbacks_controller.rb CAS + SAML authentication feature (#6425) 2018-02-04 05:42:13 +01:00
passwords_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
sessions_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00