Merge branch 'MDL-61421-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Feb 2018 03:33:53 +0000 (11:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 00:30:50 +0000 (08:30 +0800)
commitc482497d5228f392aded95e314a00a5ef6f5777b
tree90d9d2052d0733c90a27f7e46e3e8dc159a3d696
parent6478b4e4638131df3bdea40d6322202816c5716b
parentbfea8655f7831a5f8b1654e235b6a6e5a4eb1f0e
Merge branch 'MDL-61421-master' of git://github.com/sarjona/moodle