snipe 4d003ac97a Merge remote-tracking branch 'origin/develop' ... # Conflicts: # app/Http/Controllers/Auth/ResetPasswordController.php # config/version.php		2020-11-03 11:49:34 -08:00
..
admin	Merge remote-tracking branch 'origin/develop'	2020-11-03 11:49:34 -08:00
auth	Revert "Updated translations"	2020-10-08 18:43:06 -07:00
button.php	Revert "Updated translations"	2020-10-08 18:43:06 -07:00
general.php	Revert "Updated translations"	2020-10-08 18:43:06 -07:00
help.php
mail.php	Revert "Updated translations"	2020-10-08 18:43:06 -07:00
pagination.php
passwords.php	Revert "Updated translations"	2020-10-08 18:43:06 -07:00
reminders.php
table.php
validation.php	Added validation to disallow password to be the same as username, email, etc	2020-11-02 20:03:26 -08:00