Fisheye: Diff - lams-github/lams_monitoring/lams

Tree
Options

b6e6bef

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

f3144d7

LDEV-5386 Modify config files for LAMS v4.8

09 May 23 Marcin Cieslak f3144d7b1c275056481fd76050bad49b0ba6d06d

Loading ...