Merge branch 'MDL-59658-master' of git://github.com/junpataleta/moodle
commitb8cf4be7a7b21a72829cdae6f4edb7f05fa0426b
authorDan Poltawski <dan@moodle.com>
Tue, 1 Aug 2017 09:15:54 +0000 (1 10:15 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Aug 2017 09:15:54 +0000 (1 10:15 +0100)
tree54f85aa19496034e92a57dbf53f9abec97d3f67d
parent266959a41ef67e18e5625e36899a837367ed5256
parent3120ebab9d8bca90ff36dc6b19b4a7dff7c0f8a8
Merge branch 'MDL-59658-master' of git://github.com/junpataleta/moodle