Merge branch 'MDL-55215-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 01:04:34 +0000 (09:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 01:04:34 +0000 (09:04 +0800)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge