Merge branch 'master' into v4.0 # Conflicts: # lams_central/conf/security/Owasp.CsrfGuard.properties # lams_tool_assessment/src/java/org/lam…
Show more
Merge branch 'master' into v4.0# Conflicts:# lams_central/conf/security/Owasp.CsrfGuard.properties# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
Show less
