Sparky4567 308f968576 Resolved merge conflict by incorporating both suggestions.

2018-02-25 20:45:47 +02:00

..

uikit

Resolved merge conflict by incorporating both suggestions.

2018-02-25 20:45:47 +02:00

jquery.datetimepicker.js

Yello

2018-02-25 20:28:26 +02:00

jstz.min.js

Yello

2018-02-25 20:28:26 +02:00