Fisheye: Diff - lams-github/lams_build/lib/lams/lams.jar

Tree
Options

e4625a3

LDEV-4440 Almost finished learning and monitoring - needed corrections

06 Jul 18 Joanna Mielczarek <amielczarek.web@gmail.com> e4625a3ec2ff39bfe424a857788a54497ff64b7a

Merge branch 'lams31' into LDEV-4440
Conflicts:
lams_build/3rdParty.userlibraries
lams_build/lib/lams/lams-central.jar
lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

24 Jun 18 Marcin Cieslak 9349bab097150a4a15cf4c6c10b7946400c3fbd0

Loading ...