Eloy Lafuente (stronk7)
|
a86103e09b
|
Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle
Conflicts:
theme/bootstrap/style/generated.css
theme/bootstrap/style/moodle.css
theme/bootstrapbase/less/moodle/recess.txt
theme/bootstrapbase/style/generated.css
|
2013-04-26 11:10:09 +02:00 |
|