Merge remote-tracking branch 'origin/master' into feature/highlighter

This commit is contained in:
Oliver Davies 2015-08-08 19:10:33 +01:00
commit d087f15897

View file

@ -95,6 +95,14 @@ I'll probably also take the raw shell script out of Jenkins and save it in a tex
Since publishing this post, I've added some more items to the original build script.
### Updating Composer
if [ -f composer.json ]; then
/usr/local/bin/composer update
fi
Updates project dependencies via [Composer](https://getcomposer.org/doc/00-intro.md#introduction) if composer.json exists.
### Updating Sculpin Dependencies
if [ -f sculpin.json ]; then