Merge branch 'MDL-59602-master' of https://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Aug 2017 05:04:33 +0000 (07:04 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Aug 2017 05:04:33 +0000 (07:04 +0200)
commitbf0ffc9c3a7de7e64269526683338cbbd4c58cb8
tree912dbd918a85485d7378ad9469acf47c87082e0f
parent71fac459b62f0b794297a5431e1f586e3e4c4d7f
parent3d4739ab64b6fd520d72a8e236fdbad18b5a1bc8
Merge branch 'MDL-59602-master' of https://github.com/andrewnicols/moodle