snipe 61cf9ec009 Small conflict handling bits ... Signed-off-by: snipe <snipe@snipe.net>		2021-09-22 00:00:44 -07:00
..
emails	Translate emails (#2652)	2016-09-26 14:13:07 -07:00
passwords	Nicer formatting of the page if custom logout [ch15660]	2021-02-03 14:56:26 -08:00
login.blade.php	Small conflict handling bits	2021-09-22 00:00:44 -07:00
two_factor.blade.php	Added labels to password reset	2020-04-01 04:30:54 -07:00
two_factor_enroll.blade.php	Merge branch 'develop' into integrations/2020-04-15-v5-merge	2020-04-20 23:20:34 -07:00