Merge branch 'MDL-61959-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 02:16:23 +0000 (10:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 02:16:23 +0000 (10:16 +0800)
commit11dc37dacc2996b2abcaeb2fbf7e0cdfb546dd2c
treeb88822934f8bfcc0df0a7f005bb18a80d07d459a
parent11446e8dfc57a5540db6b160149b62ab1e488a79
parentdf7cc2cc7f4b7049b76636514dddddc588acba5c
Merge branch 'MDL-61959-master' of git://github.com/sarjona/moodle