Merge branch 'wip-MDL-51802-master4' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 22:22:35 +0000 (23:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 22:22:35 +0000 (23:22 +0100)
commit642a4fde4bffe449d062abd0dbfa30dfb6831197
tree4c2e822e96319374ecae46ba3f080a51d7213832
parentc70d54405b88476b12100144ef24e3235dbe9b55
parentf26481c2dc5445e1247ed15b8386e1a7afbae0c0
Merge branch 'wip-MDL-51802-master4' of https://github.com/marinaglancy/moodle
lang/en/error.php
lang/en/moodle.php
lib/outputrenderers.php
theme/bootstrapbase/style/moodle.css
version.php