Damyon Wiese ccc2966709 Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle ... Conflicts: theme/bootstrapbase/style/moodle.css		2014-02-24 15:28:51 +08:00
..
lang/en	MDL-44201 theme_canvas: unified @package use and improved coding style	2014-02-17 11:17:56 +13:00
layout	MDL-44201 theme_canvas: unified @package use and improved coding style	2014-02-17 11:17:56 +13:00
style	Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle	2014-02-24 15:28:51 +08:00
config.php	MDL-39174 fix phpdocs packages in themes	2013-04-27 13:22:59 +02:00
version.php	MDL-42701 Bump all versions near 2.6 release	2013-11-05 02:36:00 +01:00