Merge branch 'development' into swift3

* development:
  don't try and start server
This commit is contained in:
Erik Little 2016-07-21 10:52:15 -04:00
commit bb9ea1849a
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320

View File

@ -6,5 +6,4 @@ branches:
only:
- master
- development
install: node Socket.IO-Test-Server/main.js &
script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -parallelize