Merge branch 'wip-MDL-62520_MASTER' of https://github.com/jason-platts/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 10 Sep 2018 08:22:48 +0000 (16:22 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 10 Sep 2018 08:22:48 +0000 (16:22 +0800)
1  2 
user/lib.php

diff --cc user/lib.php
Simple merge