Merge branch 'wip-MDL-35668-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 03:01:41 +0000 (11:01 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 03:01:41 +0000 (11:01 +0800)
commit4dfc2d19e747c533652d6cca7b0cfcf99dd17ee4
treeadb8e29ccf395fd7bc807b778521668102748945
parent32f9550e8517c6238d0085f885e1a59add6eeb4d
parented483bda8df5bb82d52aba45d921cbf1b8919a05
Merge branch 'wip-MDL-35668-master' of git://github.com/marinaglancy/moodle