Merge branch 'MDL-61236-master' of git://github.com/farhan6318/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 11:13:55 +0000 (12:13 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 11:13:55 +0000 (12:13 +0100)
commitadc3c068bb9564eddcbf813447c3af1dc7451a9b
treef975bfaf173b598e436b16565fb088d2339c0a8c
parent132106bfefb0f5e7b0ae3bfe4bb29f718aa486d1
parent4fd0bdb2b7cc119089ab634b4f9bc521d2572b43
Merge branch 'MDL-61236-master' of git://github.com/farhan6318/moodle