Merge branch 'MDL-69930-39' of https://github.com/HuongNV13/moodle into MOODLE_39_STABLE
commit766376261aa830135f2f7ab721235229c4e5a18b
authorJun Pataleta <jun@moodle.com>
Tue, 10 Nov 2020 06:03:19 +0000 (10 14:03 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 10 Nov 2020 06:03:19 +0000 (10 14:03 +0800)
tree61195f7fb80ab8eb9b952cabf0835a9dbf622383
parent8e2e459daa1c518529aaa93dacbf9d5f6c7de9a9
parentad7b38f3ff22e926d29db388a5f1cf9d62ba8521
Merge branch 'MDL-69930-39' of https://github.com/HuongNV13/moodle into MOODLE_39_STABLE

# 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