Wächtler, Yannick 484b996879 fixed merge conflicts

2021-12-14 19:48:59 +01:00

..

assets

Merge remote-tracking branch 'origin/master' into develop

2021-11-15 19:24:38 -08:00

lang

fixed merge conflicts

2021-12-14 19:48:59 +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 conflicts

2021-12-14 19:48:59 +01:00