Merge branch 'MDL-59890-master-fix' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 4 Oct 2017 06:55:32 +0000 (14:55 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 4 Oct 2017 06:55:32 +0000 (14:55 +0800)
commit2c1be712a3bf58211af7cf20aa04b9795a7ce6e4
tree5b164c55cb7308f11c917bc332a96598c8d28a75
parent32c369818c94cf5253f383dd4cbd6dcf4eaaaeec
parent469c3b46454338affc3cd5095b8e66d07d5215e0
Merge branch 'MDL-59890-master-fix' of git://github.com/junpataleta/moodle