lams-github

Clone
Marcin Cieslak
committed
ac4d536
on 10 Sep 20
Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_admin/conf/language/lams/ApplicationResources.properties
lams_admin… Show more
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

        lams_admin/conf/language/lams/ApplicationResources.properties

        lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

        lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

        lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

        lams_admin/conf/language/lams/ApplicationResources_no_NO.properties

Show less