lams-github

Clone
Marcin Cieslak
committed
7de1c6f
on 19 Oct 18
Merge remote-tracking branch 'origin/LDEV-4609'
Conflicts:
lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDA… Show more
Merge remote-tracking branch 'origin/LDEV-4609'

Conflicts:

        lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java

        lams_gradebook/web/gradebookMonitor.jsp

Show less