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

This commit is contained in:
Weblate 2018-05-02 15:39:26 +00:00
commit 04206ec929

View file

@ -7,7 +7,7 @@ repo="$2"
curbranch="$TRAVIS_PULL_REQUEST_BRANCH" curbranch="$TRAVIS_PULL_REQUEST_BRANCH"
[ -z "$curbranch" ] && curbranch="$TRAVIS_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" ] if [ -n "$curbranch" ]
then then