Merge branch 'MDL-59382-master-4' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Aug 2017 01:31:44 +0000 (09:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Aug 2017 01:31:44 +0000 (09:31 +0800)
commitc6de3bd68fefdb0bcd4f56290b7b7d8c0cbb7e6b
treeb8e5049b7f3b49914ff4559aff1910163e2b3607
parent1e674d0147a8fe302c35d8435a5aff6a585fdf27
parentd6942fb5ba35690b5858d37e0217ca46c6110127
Merge branch 'MDL-59382-master-4' of git://github.com/ryanwyllie/moodle
blocks/calendar_month/tests/behat/block_calendar_month.feature
lang/en/moodle.php
theme/bootstrapbase/style/moodle.css
version.php