Skip to content

Commit

Permalink
Merge branch 'feature/updates-08-23-2018'
Browse files Browse the repository at this point in the history
  • Loading branch information
tuj committed Aug 23, 2018
2 parents 4e226a9 + f5dfc67 commit b765544
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ config.codekit
composer.phar
web/uploads/
/bin

composer-dev.*
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
55 changes: 20 additions & 35 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions update_bundles.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b765544

Please sign in to comment.