snipe acb90c7aee Horrible master -> dev merge that makes baby jesus cry :( ... # Conflicts: # app/Http/Controllers/Auth/LoginController.php # composer.json # composer.lock # resources/views/auth/two_factor_enroll.blade.php		2019-03-20 02:24:23 -07:00
..
general.php	Translations and nicer formatting for login/password reset	2016-05-20 00:25:45 -07:00
message.php	Horrible master -> dev merge that makes baby jesus cry :(	2019-03-20 02:24:23 -07:00