Wächtler, Yannick 5a2f8788a9 Fixed merge issue in view.blade.php and added translatable string		2021-11-16 19:34:20 +01:00
..
assets	Merge remote-tracking branch 'origin/master' into develop	2021-11-15 19:24:38 -08:00
lang	Fixed merge issue in view.blade.php and added translatable string	2021-11-16 19:34:20 +01:00
macros	Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]	2021-08-17 21:59:33 -07:00
views	Fixed merge issue in view.blade.php and added translatable string	2021-11-16 19:34:20 +01:00