Merge branch 'wip-MDL-60280-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 11:46:19 +0000 (13:46 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 11:46:19 +0000 (13:46 +0200)
commit2350745d82e2e2838d41584eb8e59d1d16d9051f
tree864c5abb542d15dc151ce63bc126d3d97bccdc19
parentdde2ba76341d8e65fee2333d6ba831d8798a6bd5
parent06f86aa8089bb75c5fcdb67b30baa1e40cb6171f
Merge branch 'wip-MDL-60280-master' of git://github.com/marinaglancy/moodle