Merge branch 'MDL-61836-master-fix' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:27:51 +0000 (02:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:27:51 +0000 (02:27 +0200)
commit774956a6eed827c9bd34dc5fd7f486784e562b27
tree52a024c060a7b5b401152775a73eb73a9f086645
parent85176022e859d8ca0dc2a4f07ffbb11b6a968b70
parentfa983cfcc06fa1cfe22cfbc5a00474793d2465f7
Merge branch 'MDL-61836-master-fix' of git://github.com/andrewnicols/moodle