Merge branch 'MDL-41847-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jul 2018 21:50:43 +0000 (23:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jul 2018 21:50:43 +0000 (23:50 +0200)
1  2 
user/editlib.php

Simple merge