Merge branch 'feature/updates-08-23-2018'

os2display · Aug 23, 2018 · b765544 · b765544
2 parents 4e226a9 + f5dfc67
commit b765544
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,4 @@ config.codekit
 composer.phar
 web/uploads/
 /bin
-
+composer-dev.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 5.1.1
+
+* Updated symfony/symfony: 2.8.44
+* Updated os2display/admin-bundle: 1.1.1
+
 ## 5.1.0
 
 * Updated symfony/symfony: 2.8.42

diff --git a/composer.lock b/composer.lock
diff --git a/update_bundles.sh b/update_bundles.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+###############################
+# Updates bundles and symfony #
+###############################
+
+bold=$(tput bold)
+normal=$(tput sgr0)
+
+composer="$(which composer)"
+php -d memory_limit=-1 $composer update symfony/symfony os2display/core-bundle os2display/admin-bundle os2display/default-template-bundle os2display/media-bundle