slhale c81e2dbb4a Merge branch 'master' of https://github.com/nasa/openmctweb into search ... Conflicts: platform/commonUI/general/src/controllers/TreeNodeController.js platform/persistence/elastic/src/ElasticSearchProvider.js		2015-08-24 13:14:43 -07:00
..
res/templates	Merge branch 'search' into open70	2015-08-19 10:05:38 -07:00
src	Merge branch 'master' of https://github.com/nasa/openmctweb into search	2015-08-24 13:14:43 -07:00
test	[Search] Update tests	2015-08-18 12:37:47 -07:00
bundle.json	[Search] Templates vs representations	2015-08-18 16:54:36 -07:00