Charles Hacskaylo 8214c8e895 Merge open933 latest, resolve conflicts ...

Fixes #933
Fair amount of manual fixing in time-conductor.html

2016-07-13 19:16:00 -07:00

..

res/templates

Merge open933 latest, resolve conflicts

2016-07-13 19:16:00 -07:00

src

Added end delta

2016-07-13 18:17:27 -07:00

bundle.js

Time sync via conductor

2016-07-07 16:57:03 -07:00