snipe 48c3d0fd19 Merge remote-tracking branch 'origin/develop' ... # Conflicts: # resources/lang/es-VE/general.php		2020-11-09 14:55:11 -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-09 14:55:11 -08:00
macros	Added welsh as an localization option	2020-10-06 19:16:29 -07:00
views	Fixed send creds checkbox in create user form	2020-11-03 13:07:15 -08:00