Merge branch 'MDL-62029-master-2' of git://github.com/snake/moodle
commit178bb8c22e525efd49cc6c1734943ced8d64b85a
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 07:49:01 +0000 (9 15:49 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:55 +0000 (10 09:15 +0800)
treec81cd1d7a268b4fbc2c8f5c0dcb8a8abc9dbc615
parent9f358de241a247e71e5c1fdd5bb325c33561f420
parente4a37fbef19aeba5287adfa800b5364ef8a84d69
Merge branch 'MDL-62029-master-2' of git://github.com/snake/moodle