Victor Woeltjen 0036974c60 Merge remote-tracking branch 'github/master' into open450b ...

Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json

2016-01-08 15:36:10 -08:00

..

lib

[Plugins] Bring over timeline, clock plugins

2015-09-14 16:45:41 -07:00

res/templates

[Frontend] Theming and cleanups in Clocks and Timers

2015-11-20 16:19:27 -08:00

src

Resolved conflict

2016-01-06 14:06:28 -08:00

test

[Licenses] Add license headers

2015-11-05 12:45:51 -08:00

bundle.js

[API] Convert JSON bundles to imperative form

2016-01-07 15:08:08 -08:00