Merge branch 'MDL-69930-master' of https://github.com/HuongNV13/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 10 Nov 2020 06:11:54 +0000 (14:11 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 10 Nov 2020 06:11:54 +0000 (14:11 +0800)
commit84b7d233349216dfa8028c9efada876cb8c739a4
tree0b21af62fa442b24548f7ff0ac8d0095d7638dd4
parent62fcc8d22a8b6abfd37371179f29ce16c6140f99
parentdc293a2eb6e3e23db9d8a71f7b4935c2123ce102
Merge branch 'MDL-69930-master' of https://github.com/HuongNV13/moodle

# Conflicts:
# question/type/ddimageortext/amd/build/question.min.js
# question/type/ddimageortext/amd/build/question.min.js.map
# question/type/ddimageortext/amd/src/question.js
question/type/ddimageortext/amd/build/question.min.js
question/type/ddimageortext/amd/build/question.min.js.map
question/type/ddimageortext/amd/src/question.js