Merge branch 'MDL-59832_master-v2' of git://github.com/markn86/moodle
commit7d08eccf431ed2d6dc29695248e78830847798a5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 23:21:22 +0000 (30 01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 23:21:22 +0000 (30 01:21 +0200)
tree60a1bfa39ab575eedf91de1f80ee9afb798f3556
parent9533cf3419a33a8d627275e830273684fe2946a3
parentd4576789e45a4dd8dced79d17500ca7d4c86b4af
Merge branch 'MDL-59832_master-v2' of git://github.com/markn86/moodle
user/index.php