Merge branch 'MDL-59672-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Sep 2017 23:18:57 +0000 (01:18 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:52:06 +0000 (10:52 +0200)
1  2 
calendar/amd/build/calendar.min.js
calendar/amd/src/calendar.js

index 212a648,accd4e6..a96ce0b
Binary files differ
Simple merge