Merge branch 'MDL-69930-310' of https://github.com/HuongNV13/moodle into MOODLE_310_S...
authorJun Pataleta <jun@moodle.com>
Tue, 10 Nov 2020 06:08:57 +0000 (14:08 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 10 Nov 2020 06:08:57 +0000 (14:08 +0800)
commite803a24401fb20ebb403e3341edbb815b6af61ae
tree6d0d262291693cc505ec28ff24e48f7d2d3dd271
parent4b0988f01461428918b09e32e2c11d591f67c695
parentef6f42a825371d43062b808e460ddbc682399357
Merge branch 'MDL-69930-310' of https://github.com/HuongNV13/moodle into MOODLE_310_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