Merge branch 'wip-MDL-27886-master' of https://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 23 Nov 2017 04:25:31 +0000 (12:25 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 23 Nov 2017 04:25:31 +0000 (12:25 +0800)
commit07a91fd4ccd56014c00fda66ad677cd019faf5b9
tree5d57e7a01e4f72440846f3206643ddf9cad0f1e9
parent1cce91b1bbf18e4119084d8844f11dc39bb21146
parentdc9353a07b3ef8753de7a130f1a2f54fc3f5028b
Merge branch 'wip-MDL-27886-master' of https://github.com/marinaglancy/moodle