Merge branch 'MDL-61718-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2018 10:38:48 +0000 (12:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:15 +0000 (18:16 +0200)
1  2 
admin/user.php

diff --cc admin/user.php
Simple merge