Brady Wetherington 3c7f2e89ec Merge branch 'develop' into remove_old_ldap ...

Had to re-do the composer install because the conflicts were too complicated.

2022-01-03 12:56:58 -08:00

..

assets

Fixed #10467 - Safari only font-awesome bug

2021-12-24 12:30:34 -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

Merge branch 'develop' into remove_old_ldap

2022-01-03 12:56:58 -08:00