Merge branch 'MDL-59666-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 04:54:27 +0000 (12:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 04:54:27 +0000 (12:54 +0800)
commitca84ba0ed2a29dde2a96e6f954052c7ffd42dcfb
tree780c248f4af5f14cde8d0601c7988effa04f127b
parentf4cc24ca648909b97e2083c151b6932d7c0a378b
parent10994cbc4a9322193ea3662cfd7f817ff8bf1100
Merge branch 'MDL-59666-master-fix' of git://github.com/junpataleta/moodle