Merge branch 'development'

os2display · Nov 22, 2017 · c457cb2 · c457cb2
2 parents 18e8742 + 8c8226f
commit c457cb2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,3 +4,4 @@
 
 * Added migration required for https://github.com/os2display/core-bundle/pull/3
 * Added migration to fixed issue with groups following renaming of Entity types.
+* Updated admin-bundle to 1.0.10, core-bundle to 1.0.10 and default-template-bundle to 1.0.4.
diff --git a/composer.lock b/composer.lock
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@

		* Added migration required for https://github.com/os2display/core-bundle/pull/3
		* Added migration to fixed issue with groups following renaming of Entity types.
		* Updated admin-bundle to 1.0.10, core-bundle to 1.0.10 and default-template-bundle to 1.0.4.