Clone
Marcin Cieslak
committed
4 days ago
Monthly merge from master to lams31
Conflicts:
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
l… Show more
Monthly merge from master to lams31

Conflicts:

        lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java

        lams_build/lib/lams/lams.jar

        lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

        lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

        lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

        lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

        lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

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

        lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

Show less