Skip to content

Commit

Permalink
Merge branch 'MDL-69930-master' of https://github.com/HuongNV13/moodle
Browse files Browse the repository at this point in the history 
# 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
  • Loading branch information
@junpataleta
junpataleta committed Nov 10, 2020
2 parents 62fcc8d + dc293a2 commit 84b7d23
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
Loading

0 comments on commit 84b7d23

Please sign in to comment.