Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
80bef09b85
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue