Merge branch 'MDL-48943-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Mar 2015 11:02:49 +0000 (12:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Mar 2015 11:02:49 +0000 (12:02 +0100)
commit3fb98d64e2dcce4bbdc9d4bddbbffb76ed59a8a7
tree29bff7716547aead1d5bbd7fb31660deebb7481c
parent728e272851a7105eca28f04d14d6ddf0c8214d2f
parentdc3b2524a1b724d55d0008616ee7164e65ecc2b8
Merge branch 'MDL-48943-master' of git://github.com/andrewnicols/moodle
calendar/lib.php
theme/bootstrapbase/less/moodle/calendar.less
theme/bootstrapbase/style/moodle.css