lams-github

Clone
Marcin Cieslak
committed
6aa0f9c
on 19 Jul 19
Merge remote-tracking branch 'origin/develop' into LDEV-4745
Conflicts:
lams_central/conf/language/lams/ApplicationResources.properties
la… Show more
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

        lams_central/conf/language/lams/ApplicationResources.properties

        lams_central/conf/language/lams/ApplicationResources_en_AU.properties

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

Show less