Merge branch 'master' into fix/social-icons

This commit is contained in:
lorin 2016-10-06 11:38:53 +02:00 committed by GitHub
commit 980ce3e626

View file

@ -19,4 +19,4 @@ script:
after_success:
- mv deploy_key ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
- '[[ $TRAVIS_BRANCH == "master" ]] && bundle exec nanoc deploy public'
- '$TRAVIS_PULL_REQUEST || [[ $TRAVIS_BRANCH == "master" ]] && bundle exec nanoc deploy public'