libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr/1789' into develop

Browse source 
Conflicts:
	.travis.yml
This commit is contained in:
Marcel Klehr 2013-10-28 12:20:10 +01:00
commit e72511349d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -3,7 +3,7 @@ node_js:
- "0.10" - "0.10"
install: install:
- "bin/installDeps.sh" - "bin/installDeps.sh"
- "export GIT_HASH=$(cat .git/HEAD | head -c 7)" - "export GIT_HASH=$(git rev-parse --verify --short HEAD)"
before_script: before_script:
- "tests/frontend/travis/sauce_tunnel.sh" - "tests/frontend/travis/sauce_tunnel.sh"
script: script: