mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-17 05:55:00 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
04206ec929
@ -7,7 +7,7 @@ repo="$2"
|
||||
|
||||
curbranch="$TRAVIS_PULL_REQUEST_BRANCH"
|
||||
[ -z "$curbranch" ] && curbranch="$TRAVIS_BRANCH"
|
||||
[ -z "$curbranch" ] && curbranch="$GIT_BRANCH" # jenkins
|
||||
[ -z "$curbranch" ] && curbranch=`"$GIT_BRANCH" | sed -e 's/^origin\///'` # jenkins
|
||||
|
||||
if [ -n "$curbranch" ]
|
||||
then
|
||||
|
Loading…
Reference in New Issue
Block a user