Merge branch 'MDL-43827-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:25:28 +0000 (00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:25:28 +0000 (00:25 +0100)
commitd048e94dfea5828a446adcfe9bc014ba112f229f
tree94ecc901b09d01a19a9ce154f185ea06ace97e82
parent9993c1d02c32760f7df036b5d92bc2f75fd98b06
parentf44f9db418689f445a410570dd688191b24d7b66
Merge branch 'MDL-43827-master' of git://github.com/mihailges/moodle