Merge branch 'MDL-59418-master' of https://github.com/Kathrin84/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Jul 2017 07:52:10 +0000 (08:52 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Jul 2017 07:52:10 +0000 (08:52 +0100)
commit9adc505b9f2f942866bd85e700e73861d044268d
tree96ea75b1605b198d02fcee701b3d919469333cac
parentd96508b610a54ff482028a3173504fd6481bc544
parentb3b938bfbc96e126cd78cc9a05b2a0f7cded085f
Merge branch 'MDL-59418-master' of https://github.com/Kathrin84/moodle