Merge branch 'MDL-55074-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 04:33:51 +0000 (12:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 04:33:51 +0000 (12:33 +0800)
1  2 
course/tests/externallib_test.php
lib/upgrade.txt
theme/bootstrapbase/style/moodle.css

Simple merge
diff --cc lib/upgrade.txt
Simple merge
Simple merge