Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/oaeproject/Hilary
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolaas Matthijs committed Aug 28, 2014
2 parents 09e46bc + f8ad269 commit 1d2526a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ before_install:
- echo "13SirapH8t3kxUh5T5aqWXhXahMzoZRA" > APIKEY.txt

# Start etherpad
- node node_modules/ep_etherpad-lite/node/server.js &
- node node_modules/ep_etherpad-lite/node/server.js &> /dev/null &

# Position ourselves to start the test in "script" phase
- cd ~/build/oaeproject/Hilary
Expand Down

0 comments on commit 1d2526a

Please sign in to comment.