Merge remote-tracking branch 'origin/master' into php54compatibility
This commit is contained in:
commit
41ea9199a0
@ -23,7 +23,7 @@
|
|||||||
<serverfile type="module" module="calendarmodule">php/module.calendar.php</serverfile>
|
<serverfile type="module" module="calendarmodule">php/module.calendar.php</serverfile>
|
||||||
</server>
|
</server>
|
||||||
<client>
|
<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="debug">js/calendarimporter-debug.js</clientfile>
|
||||||
|
|
||||||
<clientfile load="source">js/data/timezones.js</clientfile>
|
<clientfile load="source">js/data/timezones.js</clientfile>
|
||||||
|
Loading…
Reference in New Issue
Block a user