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
..
assets	Merge pull request #8551 from Godmartinz/bug/ch10148/error-when-using-dark-green-skin	2020-10-22 21:16:52 -07:00
lang	Merge remote-tracking branch 'origin/develop'	2020-11-03 11:49:34 -08:00
macros	Added welsh as an localization option	2020-10-06 19:16:29 -07:00
views	Fixed #8603 - Use correct CSS path for signature-pad.min.css	2020-11-03 10:01:55 -08:00