Merge branch 'wip-MDL-46470-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Aug 2014 22:24:51 +0000 (00:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Aug 2014 22:24:51 +0000 (00:24 +0200)
commitb8475d375c07364f2a576c0a865ef1aa028fc913
tree43565340e22c03e95b2cf680d54d159a93db55c0
parent023d75851383d8a25b2c92af4adcc0031e799e0a
parent921390f103f995acad74d8bf63460a3f3a019b63
Merge branch 'wip-MDL-46470-master' of git://github.com/marinaglancy/moodle

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