Merge branch 'wip-MDL-37977-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 12:22:01 +0000 (14:22 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 12:22:01 +0000 (14:22 +0200)
commit995457b8cfde7b9c74d41641a9604038714929bf
tree463aad904801697a6e5f0985eda9f6ca73b6be54
parentb321d231ffa123c1511c92fa92c71f1ebf449f3e
parentdcce35754c9dbc60c8830a6ace89e7a76aeb1d0a
Merge branch 'wip-MDL-37977-master' of git://github.com/marinaglancy/moodle