Merge branch 'MDL-62308_master' of git://github.com/markn86/moodle
commita83b43a1181ae81c6b39d41aa7efc6540298f3f6
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 15:52:19 +0000 (9 17:52 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:30 +0000 (10 09:17 +0800)
tree1e19c0b2232404afc0e5e00bb5a23345e4b7a742
parent9d56e7925b75ccf2a1215353a8e6246066e01b60
parent0f41e8a2a131e55e15a035bd6cdfda47901d7df0
Merge branch 'MDL-62308_master' of git://github.com/markn86/moodle