Merge branch 'MDL-62059-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:08:09 +0000 (10:08 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:08:09 +0000 (10:08 +0200)
commit205994bafee59aa22b79748b554ded2e708900b1
tree3ad9bd23a2986088b321d56e2a4aad1c4f2d4092
parentf2cb3952affeb33bff2ae8e30fb1e776b3aea669
parentc287f0fdd9227dfdc94d011126d3f7c913cad039
Merge branch 'MDL-62059-master' of git://github.com/rezaies/moodle