Merge branch 'MDL-60633-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 11:04:07 +0000 (12:04 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 11:04:07 +0000 (12:04 +0100)
commit6e3314f044f5f847704965e9b083e4c2eb38f3a9
treeb5337ad6127c1380588c80b0ac664391f1d6618b
parent2a542d0265d9dd73b2e660c07c500441e67b8b6c
parent314b8093e79e7d1fd713d45844da2f6cf67007ea
Merge branch 'MDL-60633-master' of git://github.com/andrewnicols/moodle