Merge branch 'MDL-60065-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 05:07:45 +0000 (13:07 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 05:07:45 +0000 (13:07 +0800)
commitbf2742f2f22dd8c86e2f973aa1f992624ed0bef2
tree7df055d03db51de93ea48913e2de95ae76f3e517
parent23277c9f8f1bb6232ed950c10fb4db6b42ff8fcf
parent6038d62625f896f604a7809982aa4e5829840293
Merge branch 'MDL-60065-master' of git://github.com/andrewnicols/moodle