Merge branch 'MDL-58906-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 26 Jul 2017 12:42:38 +0000 (14:42 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 26 Jul 2017 12:42:38 +0000 (14:42 +0200)
commitab4ae50603be7a0c434d5de1fbffc3ef17242dc0
tree8e9b9c9ede0acc1af61d00f4765a2ed67744d063
parent1ea51648331ee4637a006ca0708b9bdf147dbc2d
parent9b5d8879672d369bf27daa9e698a99c4b4bafe99
Merge branch 'MDL-58906-master' of git://github.com/ankitagarwal/moodle