Merge branch 'master' into feature/BAP-15273

# Conflicts: # package/platform/src/Oro/Bundle/ActivityListBundle/Resources/public/js/activity-condition.js
oroinc · Oct 4, 2017 · e1cf7eb · e1cf7eb
2 parents bf87069 + 0b2767d
commit e1cf7eb
Show file tree

Hide file tree

Showing 765 changed files with 27,652 additions and 12,434 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/UPGRADE-1.10.1.md b/UPGRADE-1.10.1.md
diff --git a/UPGRADE-1.10.md b/UPGRADE-1.10.md
diff --git a/UPGRADE-1.3.md b/UPGRADE-1.3.md
diff --git a/UPGRADE-1.4.md b/UPGRADE-1.4.md