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

..

actions

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

capabilities

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

controllers

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

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

directives

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

services

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

TimelineConstantsSpec.js

[Build] Remove boilerplate from scripts

2016-03-04 10:46:38 -08:00

TimelineFormatterSpec.js

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00