Victor Woeltjen f27e4d6e06 Merge branch 'open-master' into open1482c ... Merge in latest in preparation to merge; WTD-1482 Conflicts: platform/commonUI/browse/src/creation/CreationService.js platform/core/src/models/RootModelProvider.js platform/entanglement/src/services/LinkService.js platform/entanglement/src/services/MoveService.js		2015-08-19 15:00:52 -07:00
..
lib	[Common UI] Add JSDoc, remove UUIDService	2014-11-25 16:14:09 -08:00
res/templates	Merge branch 'open-master' into open-965	2015-08-06 16:13:37 -07:00
src	Merge branch 'open-master' into open1482c	2015-08-19 15:00:52 -07:00
test	[Style] JSLint Compliance	2015-08-06 15:21:28 -07:00
bundle.json	[Representations] grid-item and label display links	2015-08-06 15:12:02 -07:00