snipe 398180dc59 Small merge unmagling ... Signed-off-by: snipe <snipe@snipe.net>		2021-12-16 14:38:04 -08:00
..
assets	Merge remote-tracking branch 'origin/master' into develop	2021-11-15 19:24:38 -08:00
lang	Merge master down into develop	2021-12-16 14:26:24 -08:00
macros	Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]	2021-08-17 21:59:33 -07:00
views	Small merge unmagling	2021-12-16 14:38:04 -08:00