djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-16 13:14:17 -05:00
Code Issues Packages Projects Releases Wiki Activity
1253279feb
tootlab-mastodon/app/controllers/settings/two_factor_authentication
History
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb
2018-01-21 13:36:10 -06:00
..
confirmations_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-21 13:36:10 -06:00
recovery_codes_controller.rb Set packs on 2FA-related pages. Fixes #271. 2017-12-20 03:15:54 -06:00