Merge branch 'wip-MDL-59770-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Sep 2017 11:28:07 +0000 (12:28 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:15 +0000 (10:50 +0200)
commit72086f77f1766cb58ab537872fb88c069b26c8fc
treed59c7faa03f2f2dad4528388b31fdc5c077796b1
parentedb911984aad30a70a43c2a9d3018d2f227a4b0e
parent4aef64f85fab3078d530a402fb4838cdf9d3898d
Merge branch 'wip-MDL-59770-master' of git://github.com/marinaglancy/moodle