luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/auth
History
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
..
confirmations_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-30 17:20:07 -06:00
passwords_controller.rb
registrations_controller.rb
sessions_controller.rb Set packs on 2FA-related pages. Fixes #271. 2017-12-20 03:15:54 -06:00