Merge branch 'MDL-60899-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Dec 2017 03:48:42 +0000 (11:48 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:31 +0000 (19:53 +1300)
commit0ea7278f6417cc163e253c3b821a1a59b4554f17
tree4f18831a87f4fdc8417d2934897f0f72bcdb5fb8
parenta569a33097fc25300092263cf7401d6385b3595f
parent8b0801c2b8c0d55a1b3f3c74e5a52b94184fc966
Merge branch 'MDL-60899-master' of git://github.com/damyon/moodle