Merge branch 'MDL-44646-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 20 Jun 2018 11:07:32 +0000 (13:07 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 20 Jun 2018 11:07:32 +0000 (13:07 +0200)
commit130ab46d37311025735616e337a6b0f685bda714
tree7162c8a7ae65a59ed63c18e8fd294540430f6203
parente3037af5666ccf67c80db9b94e70b0405bc759aa
parent78f6d02b8cd1c45cf7d4e5464bdf64e976e3ea18
Merge branch 'MDL-44646-master' of https://github.com/lucaboesch/moodle