taz-crm / taz-orocrom / 8fe29de18b5

Commits

Maksym Perepelytsya committed 8fe29de18b5M03 Nov 2016

Merge branch 'master' into ticket/CRM-6332

Conflicts:
	package/platform/src/Oro/Bundle/WorkflowBundle/Model/WorkflowRegistry.php
	package/platform/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Model/WorkflowRegistryTest.php

Showing diff to5818a5fd1c8