Merge branch 'MDL-61678' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 22 Mar 2018 04:33:24 +0000 (12:33 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 22 Mar 2018 04:33:24 +0000 (12:33 +0800)
commitfa54a1a7e24eeaaf8dbffbcc653ae1e53baaa83a
tree7737228e44a023930d53d40c70b43c981c559678
parenta44987a0818841798994c95bc32c3e676b6cac27
parent20f808165b43438dc14e42d41ee27b219018648e
Merge branch 'MDL-61678' of git://github.com/stronk7/moodle