Merge branch 'MDL-60811-master' of git://github.com/farhan6318/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 00:48:21 +0000 (08:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 00:48:21 +0000 (08:48 +0800)
commit36052f718567e62a53c983ad69976272be34f9de
tree4bfde94dfcdc00fc8490c7bd6981721ebb6a07c5
parent92221e9d442037fdf65bb512c055b96591490e1b
parentebaf979c94de3a4b0945485af4c076998e05f7dd
Merge branch 'MDL-60811-master' of git://github.com/farhan6318/moodle