lams-github

Conflicts:

        lams_admin/web/sessionmaintain.jsp

        lams_build/build.xml

        lams_build/lib/lams/lams.jar

        lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

        lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

Show less