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)
commitc121e849c1838fb37679e3833ce87e3f9f01fd06
tree57869de54c9a52446729433b2cc9fe9ad2027519
parent77f9983189568d4ceac592734c2ed62019ec7ae5
parentb6e594b1b9193174bce5652bdbf7f1b94d987ba2
Merge branch 'MDL-41847-master' of git://github.com/sarjona/moodle
user/editlib.php