Merge branch 'MDL-60646-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jan 2018 10:27:03 +0000 (11:27 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:16 +0000 (10:33 +0800)
commite9fd486eb6dc3d08011b1e5de5243c7fed68a072
tree388edd2142150ed316295c5b48e385374db62d03
parentf372f9665656572a1ed3a524be2af0967bdcefdf
parent4369677af2b2c25f4e8e60b88f91f38510725c09
Merge branch 'MDL-60646-master' of git://github.com/junpataleta/moodle