Merge branch 'MDL-61027-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:56:18 +0000 (11:56 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:56:18 +0000 (11:56 +0100)
commit02e6350222aa3e61624783feddd3e400a9b7bcc9
tree7fc9e6c0b593fa6aee34a0d38cdbfcf0d26e00c6
parent69b4a73de8372adbf4b1d25fbb8faa7e9c7ed22e
parent425817793ae6288ee27758eab946b459331aff79
Merge branch 'MDL-61027-master' of git://github.com/rezaies/moodle