diff options
| author | Marcel Klehr <mklehr@gmx.net> | 2013-10-28 12:20:10 +0100 |
|---|---|---|
| committer | Marcel Klehr <mklehr@gmx.net> | 2013-10-28 12:20:10 +0100 |
| commit | e72511349d9fbd079997f7d3ea1c239eac5b04c6 (patch) | |
| tree | 9c03037bd08a0bbe1138845710d28005d0ac4202 | |
| parent | 975eae350e29b21f3963535442374e73770bbb03 (diff) | |
| parent | fe0104f336b533ec37097e544a345c72042f0217 (diff) | |
| download | etherpad-lite-e72511349d9fbd079997f7d3ea1c239eac5b04c6.zip | |
Merge branch 'pr/1789' into develop
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 74f68f86..4cdf6383 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ node_js: - "0.10" install: - "bin/installDeps.sh" - - "export GIT_HASH=$(cat .git/HEAD | head -c 7)" + - "export GIT_HASH=$(git rev-parse --verify --short HEAD)" before_script: - "tests/frontend/travis/sauce_tunnel.sh" script: |