Fisheye: Diff - lams-github/lams

Tree
Options

b8e5128

Merge remote-tracking branch 'origin/master' into lams31
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_build/build_base.xml
# lams_build/lib/lams/lams.jar
# lams_central/web/WEB-INF/struts-config.xml
# lams_common/build.xml
# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

19 Oct 18 Marcin Cieslak b8e51289e8498d408a9379a64353ad9ca97e6fed

9bb6158

LDEV-4661 Move dependency to lams.jar

12 Sep 18 Marcin Cieslak 9bb615833c00a9139a689328ec07aaad8ee5cb16

Loading ...