Victor Woeltjen 1efa97e6f5 Merge remote-tracking branch 'github/master' into open115b ...

Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js

2015-10-09 10:32:43 -07:00

..

res/templates

[Frontend] Time controller-related styling

2015-09-29 08:43:34 -07:00

src

[Time Conductor] Ignore empty series

2015-09-24 17:01:50 -07:00

test

[Time Conductor] Update failing specs

2015-09-16 15:23:08 -07:00

bundle.json

Merge branch 'open1515' into open115

2015-09-23 16:05:09 -07:00