Merge remote-tracking branch 'origin/develop' into develop

pull/4105/head
RiotTranslate 2017-05-31 15:42:02 +00:00
commit 80bef09b85
1 changed files with 2 additions and 0 deletions

View File

@ -6,6 +6,8 @@
# the branch the current checkout is on, use that branch. Otherwise,
# use develop.
set -e
# Look in the many different CI env vars for which branch we're
# building
if [[ "$TRAVIS" == true ]]; then