Merge branch 'wip-mdl-48114' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 04:18:34 +0000 (12:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 04:18:34 +0000 (12:18 +0800)
1  2 
composer.json

diff --cc composer.json
Simple merge