Merge branch 'MDL-61960-master' of git://github.com/farhan6318/moodle
commitea08da4613ae21a7ee93f3654a9cdd578e2325df
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Jul 2018 23:23:50 +0000 (31 07:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Jul 2018 23:23:50 +0000 (31 07:23 +0800)
treed7cc51ae1be64cbcdfecadbc8c62a42fe33e16f1
parent060277a4014ee4d31ad74a2631b637f22ac57e87
parentfad9dc92902e7c1fd6d5b20d4efb78cacf51aaac
Merge branch 'MDL-61960-master' of git://github.com/farhan6318/moodle