lams-github

Clone
Andrey Balan
committed
f7937ad
on 10 Jan 20
Merge branch 'master' into v4.0
# Conflicts:
# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
# lams_tool_la… Show more
Merge branch 'master' into v4.0

# Conflicts:

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

#       lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java

#       lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java

Show less