Merge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Aug 2017 03:30:59 +0000 (11:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Aug 2017 03:30:59 +0000 (11:30 +0800)
commit4520fdffd5e00d7bb4815bf296f81cf98f393a76
treecb7ac158b374cf34e5d89def4840aeb9db81b17a
parent9e2201677802541faea86e0d93b6c9abe558c407
parenta06b3a27b7443aa3dc5478a9a48f14e5111d053d
Merge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle
calendar/amd/build/view_manager.min.js
calendar/amd/src/view_manager.js