Merge branch 'MDL-59688-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Aug 2017 09:24:50 +0000 (10:24 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Aug 2017 09:24:50 +0000 (10:24 +0100)
commit4e597bf219f81e02d653d73692dfa60c6a1fd5b5
tree26bf81d11906cd815d67b89a339b66440364b61d
parentfaf83f3d41537690d934bb1aa4952f2832e8cc65
parent80a2937dbe7334b97daa5b0a8792e272d40cd2f1
Merge branch 'MDL-59688-master' of git://github.com/damyon/moodle