Fisheye: Diff - lams-github/lams_learning/web/grouping/choose.jsp

Tree
Options

330b0d5

Merge branch 'LDEV-5436' into v4.8
# Conflicts:
# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
# lams_learning/web/presenceChat.jsp
# lams_monitoring/web/gate/gateStatus.jsp
# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
# lams_tool_images/web/pages/learning/learning.jsp

29 Feb 24 Marcin Cieslak 330b0d5f8fa4a8deb6d7454f92bdbd289e89cb82

eae47fc

LDEV-5397 make rule more spicific otherwise it affects change portrait dialog

09 Jan 24 Andrey Balan eae47fcf3922751f0b47340e524e28197830e239

Loading ...