Merge branch 'MDL-59823-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 07:49:24 +0000 (15:49 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 07:49:24 +0000 (15:49 +0800)
commitb26ce53776af5ee688cd38f7e55d1201e7ed7542
treef286405f3cc3b423390ec2fe4c30977381f59ab0
parent08bcea48d4657bb7ee4323758fb9f0ae54630f8b
parentf4ddc4ecd308f9c353c9ca1373cefa455f8961de
Merge branch 'MDL-59823-master' of git://github.com/damyon/moodle
enrol/locallib.php
user/index.php