Merge branch 'MDL-49329-master-multiplug' of git://github.com/mudrd8mz/moodle
commit293197afb321a611edd649239898d19f0f1b8ad7
authorDan Poltawski <dan@moodle.com>
Fri, 16 Oct 2015 13:53:26 +0000 (16 14:53 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 16 Oct 2015 13:53:26 +0000 (16 14:53 +0100)
tree8ff3ee9ad80363a79b8e2f744bf4e45f5bcb2e1b
parent1b7bf435625a81a78e2904a86d3bcaa0dc80a193
parent30c264211ebd826e411a6987c3e87ba8f0c8651e
Merge branch 'MDL-49329-master-multiplug' of git://github.com/mudrd8mz/moodle
lang/en/admin.php
theme/bootstrapbase/style/moodle.css
version.php