Victor Woeltjen 9435e75461 Merge remote-tracking branch 'slhale/open33' into open47b ... Fix merge conflict in preparation to integrate nasa/openmctweb#47 Conflicts: platform/commonUI/browse/res/templates/browse/object-header.html		2015-07-24 13:46:37 -07:00
..
lib	[Common UI] Add JSDoc, remove UUIDService	2014-11-25 16:14:09 -08:00
res/templates	Merge remote-tracking branch 'slhale/open33' into open47b	2015-07-24 13:46:37 -07:00
src	[Browse] Removed destroy functions	2015-07-14 13:25:25 -07:00
test	[Browse] Tests completed	2015-07-07 09:28:01 -07:00
bundle.json	Merge remote-tracking branch 'slhale/open33' into open47b	2015-07-24 13:46:37 -07:00