Merge branch 'MDL-61444-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 01:59:15 +0000 (09:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 01:59:15 +0000 (09:59 +0800)
commitd40b84e25362b85decbb0332d8accb24d94ffd05
tree777c6e88b7bbfc72f526ac2914de1a3854c6f2f6
parent0f8c06e0f51533723e4e090c64c94532e189b5e6
parent4509be229621176b9d80c9c3615320ef48a17fa4
Merge branch 'MDL-61444-master' of git://github.com/lameze/moodle