lams-github

Clone
Marcin Cieslak
committed
585d63b
on 20 Nov 19
Merge branch 'LDEV-4827' into LDEV-4745
Conflicts:
lams_admin/conf/language/lams/ApplicationResources.properties
lams_common/src/java/org/… Show more
Merge branch 'LDEV-4827' into LDEV-4745

Conflicts:

        lams_admin/conf/language/lams/ApplicationResources.properties

        lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

Show less