Merge branch 'MDL-57557-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Mar 2017 19:23:41 +0000 (20:23 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:03:53 +0000 (18:03 +0000)
commitd8a70ba35f2b72e88c22df31909ff483c50e7a9d
tree501e1d7899a67cdfe4ea3162b65bf4181b6b5626
parent1523d53bdc4886faca70225cb238474ba6e6e205
parentddc1306c979bccdbb5f08c45679356909c1b144b
Merge branch 'MDL-57557-master' of git://github.com/danpoltawski/moodle
calendar/lib.php
theme/bootstrapbase/style/moodle.css