lams-github

Conflicts:

        lams_build/conf/slim/standalone.xml

        lams_build/conf/standalone.xml

        lams_build/lib/lams/lams-central.jar

        lams_build/lib/lams/lams.jar

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

        lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

        lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

        lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

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

        lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

        lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Show less