Merge branch 'MDL-60275_master' of git://github.com/dmonllao/moodle
commit7106ac6b15c3ecae3075319a2947e745381a0684
authorJun Pataleta <jun@moodle.com>
Tue, 10 Oct 2017 02:10:09 +0000 (10 10:10 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 10 Oct 2017 02:10:09 +0000 (10 10:10 +0800)
tree7b763edf74a8ba1d6913fdcc9989bd3931629111
parent1e7ed737d29bbeddae5e17ce6904bc0e0cd5f471
parent698f3617026e2ac439f363afa1dba7da39a21ba4
Merge branch 'MDL-60275_master' of git://github.com/dmonllao/moodle