Merge branch 'development'

os2display · Jul 3, 2018 · 4e226a9 · 4e226a9
2 parents c457cb2 + 49de543
commit 4e226a9
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 5.1.0
+
+* Updated symfony/symfony: 2.8.42
+* Updated os2display/core-bundle: 1.1.0
+* Updated os2display/admin-bundle: 1.1.0
+* Updated os2display/default-template-bundle: 1.1.0
+
 ## 5.0.2
 
 * Added migration required for https://github.com/os2display/core-bundle/pull/3

diff --git a/composer.json b/composer.json
@@ -14,7 +14,8 @@
     "os2display/default-template-bundle": "^1.0",
     "incenteev/composer-parameter-handler": "^2.0",
     "sonata-project/admin-bundle": "^2.0",
-    "sonata-project/doctrine-orm-admin-bundle": "^2.0"
+    "sonata-project/doctrine-orm-admin-bundle": "^2.0",
+    "os2display/core-bundle": "^1.1"
   },
   "require-dev": {
     "sensio/generator-bundle": "^2.3",

diff --git a/composer.lock b/composer.lock