Merge remote-tracking branch 'origin/master' into php54compatibility

This commit is contained in:
2016-12-05 20:54:42 +01:00

View File

@@ -23,7 +23,7 @@
<serverfile type="module" module="calendarmodule">php/module.calendar.php</serverfile>
</server>
<client>
<clientfile load="release">js/calendarimporter-debug.js</clientfile>
<clientfile load="release">js/calendarimporter.js</clientfile>
<clientfile load="debug">js/calendarimporter-debug.js</clientfile>
<clientfile load="source">js/data/timezones.js</clientfile>