Merge branch 'MDL-60997-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jan 2018 09:38:58 +0000 (10:38 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:16 +0000 (10:33 +0800)
commitf372f9665656572a1ed3a524be2af0967bdcefdf
tree42d0fdfaf7b724b63ff06e8921b2af1325f62946
parent54c51cc81051432665638dbbf0676b3bc7e6d7e4
parent558a6a79d652f68acd7475778ca39f22091e6d45
Merge branch 'MDL-60997-master' of git://github.com/junpataleta/moodle