Merge branch 'MDL-48283-master' of git://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jun 2015 05:13:10 +0000 (07:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jun 2015 05:13:10 +0000 (07:13 +0200)
commit33e8095d94d60f279dcf250a210dc3646b509714
tree2d8bc7aaa817daf63347e28769647333ce11159a
parentd04e408e3857b59f41ba4083154f5103d948bb73
parent8ccd193498af3afdacaa3427f2d89c0e5a2eb4dd
Merge branch 'MDL-48283-master' of git://github.com/xow/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/style/moodle.css