Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame
2016-03-17 21:06:54 +09:00
1140 changed files with 179704 additions and 179635 deletions
Vendored
+1 -1
View File
@@ -86,7 +86,7 @@ declare module "ws" {
addListener(event: string, listener: () => void): this;
}
module WebSocket {
namespace WebSocket {
export interface IServerOptions {
host?: string;
port?: number;