Damyon Wiese 515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle ...

Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php

2014-04-08 13:30:41 +08:00

..

completion

Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

2014-04-08 13:30:41 +08:00

date

Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

2014-04-08 13:30:41 +08:00

grade

Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

2014-04-08 13:30:41 +08:00

group

Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

2014-04-08 13:30:41 +08:00

grouping

Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

2014-04-08 13:30:41 +08:00

profile

Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

2014-04-08 13:30:41 +08:00