Merge branch 'MDL-59974-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Sep 2017 11:55:31 +0000 (13:55 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:17 +0000 (10:50 +0200)
commit4cc3f4f08626fd83bc3966c2fe4660a211a56c02
tree252c400e3b22a0bf3c18b1dc3542e5d322a19892
parent44e1928532f323a66abab77a0be8ffccab0a0180
parentda1f058254be02c7f30dc4146f3ed2016b94ab1c
Merge branch 'MDL-59974-master' of git://github.com/lameze/moodle