Merge branch 'MDL-29801_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2015 17:19:27 +0000 (19:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2015 17:19:27 +0000 (19:19 +0200)
commite45f622b8e123d8c4973542d44fa8896cdf4081d
tree9cf2dbf11d64e577d382f62faadabefb87152080
parent8a6900ff56a6545a66d8bc56ac22aab5778078cc
parent9cf81a1a1652080c83deea0072a74eeba8520818
Merge branch 'MDL-29801_master' of git://github.com/markn86/moodle
lang/en/role.php
lib/db/upgrade.php
theme/bootstrapbase/style/moodle.css
version.php