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
..
general.php	Merge remote-tracking branch 'origin/develop'	2020-11-03 11:49:34 -08:00
message.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00