Skip to content

Commit

Permalink
Merge branch 'master' into multiple-connections
Browse files Browse the repository at this point in the history
  • Loading branch information
danielbayerlein committed Apr 2, 2017
2 parents 725c6f8 + c309467 commit 39d4ff8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion license.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016-2017 @ziyasal
Copyright (c) 2016-2017 @ziyasal & @danielbayerlein

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"socket.io": "^1.7.3"
},
"devDependencies": {
"coveralls": "^2.12.0",
"eslint": "^3.18.0",
"eslint-config-airbnb-base": "^11.1.1",
"coveralls": "^2.13.0",
"eslint": "^3.19.0",
"eslint-config-airbnb-base": "^11.1.2",
"eslint-formatter-pretty": "^1.1.0",
"eslint-plugin-import": "^2.2.0",
"husky": "^0.13.2",
"husky": "^0.13.3",
"jest": "^19.0.2"
},
"jest": {
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,9 @@ core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"

coveralls@^2.12.0:
version "2.12.0"
resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.12.0.tgz#b3d064108e29728385b56e42fc2d119f43e0e517"
coveralls@^2.13.0:
version "2.13.0"
resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.0.tgz#df933876e8c6f478efb04f4d3ab70dc96b7e5a8e"
dependencies:
js-yaml "3.6.1"
lcov-parse "0.0.10"
Expand Down Expand Up @@ -786,9 +786,9 @@ escope@^3.6.0:
esrecurse "^4.1.0"
estraverse "^4.1.1"

eslint-config-airbnb-base@^11.1.1:
version "11.1.1"
resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.1.1.tgz#61e9e89e4eb89f474f6913ac817be9fbb59063e0"
eslint-config-airbnb-base@^11.1.2:
version "11.1.2"
resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.1.2.tgz#259209a7678bf693e31cbe8f953f206b6aa7ccc3"

eslint-formatter-pretty@^1.1.0:
version "1.1.0"
Expand Down Expand Up @@ -830,9 +830,9 @@ eslint-plugin-import@^2.2.0:
minimatch "^3.0.3"
pkg-up "^1.0.0"

eslint@^3.18.0:
version "3.18.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b"
eslint@^3.19.0:
version "3.19.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
dependencies:
babel-code-frame "^6.16.0"
chalk "^1.1.3"
Expand Down Expand Up @@ -1218,9 +1218,9 @@ http-signature@~1.1.0:
jsprim "^1.2.2"
sshpk "^1.7.0"

husky@^0.13.2:
version "0.13.2"
resolved "https://registry.yarnpkg.com/husky/-/husky-0.13.2.tgz#9dcf212f88e61dba36f17be1a202ed61ff6c0661"
husky@^0.13.3:
version "0.13.3"
resolved "https://registry.yarnpkg.com/husky/-/husky-0.13.3.tgz#bc2066080badc8b8fe3516e881f5bc68a57052ff"
dependencies:
chalk "^1.1.3"
find-parent-dir "^0.3.0"
Expand Down

0 comments on commit 39d4ff8

Please sign in to comment.