lams-github

Conflicts:

        lams_admin/conf/language/lams/ApplicationResources.properties

        lams_build/lib/lams/lams.jar

        lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

        lams_central/web/WEB-INF/struts-config.xml

        lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

        lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

        lams_gradebook/web/gradebookMonitor.jsp

        lams_monitoring/conf/language/lams/ApplicationResources.properties

Show less