Merge branch 'MDL-57611-master' of https://github.com/jebarviabb/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 15 Aug 2017 03:49:38 +0000 (11:49 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 15 Aug 2017 03:49:38 +0000 (11:49 +0800)
commitfa435675ec15cd54c870d9f4e2caf98d1d06b90e
treebc03d15e16ffca4978b4e2d2acf0287a17b0ff48
parent69e08502927c22a3fa55f69cb5cbdf45d31675e5
parent93e071c8ec1e7fd96b3a9b50480da6cc7e241edf
Merge branch 'MDL-57611-master' of https://github.com/jebarviabb/moodle