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)
1  2 
enrol/locallib.php
user/index.php

Simple merge
diff --cc user/index.php
Simple merge