Merge branch 'MDL-36056-master-fix1' of http://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Dec 2017 02:47:16 +0000 (15:47 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:31 +0000 (19:53 +1300)
commit1b98e553a7ad98623ed59f2d335b68a41c0f9468
tree08c1aac5448353035f7062a863fc4564b119c803
parent9e51dc406f2eb221765f7be2fd98b267ea49dd75
parent387f7aae0d8b41969e48e1b489f9813520be2830
Merge branch 'MDL-36056-master-fix1' of github.com/damyon/moodle