Merge branch 'MDL-62231-34' of git://github.com/rezaies/moodle into MOODLE_34_STABLE
commit46985532b5726ff729066b9b7db75adfe7170042
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 04:10:26 +0000 (1 12:10 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 May 2018 10:32:28 +0000 (1 12:32 +0200)
tree153ca6ebf17535cdc748975bb9ef16978cba4168
parent82c8ef17b05cea1738ff32aa337d71fbe1d20d6c
parent75dc5bf14b965887c9f702e0758ec584d8ae6da6
Merge branch 'MDL-62231-34' of git://github.com/rezaies/moodle into MOODLE_34_STABLE