Fisheye: Diff - lams-github/lams_admin/web/sessionmaintain.jsp

Tree
Options

fd2cfad

Merge branch 'lams31' into LDEV-4440
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

19 Oct 18 Marcin Cieslak fd2cfad55c7c517931f69334ce644d509ec28140

79b6147

LDEV-4440 Admin - fixed sign up management, added errorMaps

25 Aug 18 Joanna Mielczarek <amielczarek.web@gmail.com> 79b6147f263fbc3c92e2db7d98227fa8f7358851

Loading ...