lams-github

Clone
Marcin Cieslak
committed
77f1084
on 20 Jul 18
Merge remote-tracking branch 'asia/LDEV-4440' into LDEV-4440
Conflicts:
lams_build/lib/lams/lams-central.jar
lams_build/lib/lams/lams.jar… Show more
Merge remote-tracking branch 'asia/LDEV-4440' into LDEV-4440

Conflicts:

        lams_build/lib/lams/lams-central.jar

        lams_build/lib/lams/lams.jar

        lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java

Show less