Victor Woeltjen 264896c264 Merge branch 'master' into persist-on-mutation-825 ...

Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/commonUI/edit/test/actions/RemoveActionSpec.js
	platform/entanglement/src/services/LinkService.js
	platform/features/timeline/src/controllers/drag/TimelineDragHandler.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDecorator.js
	platform/features/timeline/test/controllers/drag/TimelineDragHandlerSpec.js
	platform/features/timeline/test/controllers/swimlane/TimelineSwimlaneDropHandlerSpec.js

2016-05-20 14:26:39 -07:00

..

res/templates

Merged from master

2015-11-25 09:04:11 -08:00

src

Merge branch 'master' into persist-on-mutation-825

2016-05-20 14:26:39 -07:00

test

Merge branch 'master' into persist-on-mutation-825

2016-05-20 14:26:39 -07:00

bundle.js

Merge branch 'master' into open671

2016-04-08 16:08:19 -07:00