Charles Hacskaylo 442229fd42 Merge branch 'master' of https://github.com/nasa/openmctweb into open445 ... Conflicts: platform/features/plot/res/templates/plot.html		2016-01-13 16:01:02 -08:00
..
css	[Frontend] IN-PROGRESS Major restructuring of /platform/commonUI/ to add themes structure	2015-09-03 15:34:39 -07:00
fonts/symbols	[Frontend] Integrating new Inspect icon from prod-uisymbols	2015-11-04 14:29:21 -08:00
images	Merge branch 'open-master' into open737	2015-01-27 16:40:32 -08:00
sass	Merge branch 'master' of https://github.com/nasa/openmctweb into open445	2016-01-13 16:01:02 -08:00
templates	[Common UI] Remove obsolete split-pane container	2016-01-04 11:34:24 -08:00
config.rb	[Frontend] IN-PROGRESS Major restructuring of /platform/commonUI/ to add themes structure	2015-09-03 15:34:39 -07:00