Merge branch 'MDL-62209-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:42:44 +0000 (11:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:42:44 +0000 (11:42 +0800)
commitcb3cd93b391f7f0bc0b8049b3c877bdfcf520c41
tree99566d2129aca6cdbdf46f0a2cf6507cb5b31b3f
parentc9591cdde6c4185026f74aa0f034c578306338e7
parent38ffa48cf5e960943624bcd7bbaa994d5842caef
Merge branch 'MDL-62209-master' of git://github.com/junpataleta/moodle