David Yip 01f91695f5 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	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
registrations_controller.rb	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
sessions_controller.rb	Set packs on 2FA-related pages. Fixes #271.	2017-12-20 03:15:54 -06:00