Merge branch 'MDL-57840-33-get_users_by_field' of https://github.com/roperto/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Mar 2017 00:05:47 +0000 (01:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Mar 2017 00:05:47 +0000 (01:05 +0100)
1  2 
user/lib.php
user/tests/userlib_test.php

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