lams-github

Clone
Marcin Cieslak
committed
b6e6bef
on 08 Aug 23
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397
# Conflicts:
# lams_build/lams_build.eml
# lams_central/web/css/components.css
# l… Show more
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

Show less