Merge branch 'MDL-65170-master' of https://github.com/snake/moodle
authorSara Arjona <sara@moodle.com>
Wed, 24 Apr 2019 07:02:20 +0000 (09:02 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 24 Apr 2019 07:02:20 +0000 (09:02 +0200)
1  2 
user/lib.php

diff --cc user/lib.php
Simple merge