Commits

Dmytro Krushelnytskyi committed 877e95d5b50M
Merge branches 'feature/BAP-11559' and 'master' of github.com:laboro/dev into feature/BAP-11559 # Conflicts: # .travis/default.sh # package/crm/src/OroCRM/Bundle/ContactBundle/Resources/doc/api/contact.md # package/crm/src/OroCRM/Bundle/SalesBundle/Resources/doc/api/b2b_customer.md # package/crm/src/OroCRM/Bundle/SalesBundle/Resources/doc/api/opportunity.md # package/crm/src/OroCRM/Bundle/SalesBundle/Resources/translations/messages.en.yml # package/platform/src/Oro/Bundle/ApiBundle/ApiDoc/Parser/ApiDocMdParser.php