Merge branch 'MDL-58096-master' of git://github.com/StudiUM/moodle
commit80362f64dbb61281dfee73c661ec029f78cef85b
authorDavid Monllao <david.monllao@gmail.com>
Tue, 18 Apr 2017 21:17:50 +0000 (19 05:17 +0800)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 18 Apr 2017 21:17:50 +0000 (19 05:17 +0800)
tree8bf27dcfd6e398553d25bc75fe8de57995cbf64c
parent2b4bafc6c2910dba4a2af33f0cb8980d67c84d2c
parentdfbc82ec5f595dc3126fedc2fcc71f3438a6453a
Merge branch 'MDL-58096-master' of git://github.com/StudiUM/moodle