Merge branch 'MDL-59885-master' of git://github.com/cameron1729/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 06:48:04 +0000 (14:48 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 06:48:04 +0000 (14:48 +0800)
commit33b46e54bbd94064bdae011f229f27cc5351a8d1
tree2590558bc32f0d2d41070aed4b0c78f9b4422478
parent3bb2900cf76b2c77811d02aa02688e79f861cfd8
parent5e6a36f845f6f85a411e46e5cee9f8319acc91f0
Merge branch 'MDL-59885-master' of git://github.com/cameron1729/moodle