Fisheye: Diff - lams-github/lams_monitoring/web/monitor.jsp

Tree
Options

78d4b7f

Merge remote-tracking branch 'origin/v4.7' into LDEV-5397
# Conflicts:
# lams_tool_sbmt/web/learner/sbmtlearner.jsp

26 Aug 23 Marcin Cieslak 78d4b7fda7982f0f9957d6ab206ce9c741f2eea1

Merge remote-tracking branch 'origin/v4.7' into LDEV-5397
# Conflicts:
# lams_build/lams_build.eml
# lams_central/web/css/components.css
# lams_gradebook/lams_gradebook.eml
# lams_monitoring/lams_monitoring.eml
# lams_monitoring/web/monitor.jsp
# lams_tool_laqa/web/learning/AnswersContent.jsp
# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
# lams_www/web/public/ckeditor-templates/bootsnippets.js

08 Aug 23 Marcin Cieslak b6e6befa01b244e05a9aa6408e0de4a56327deb0

Loading ...