Skip to content

Commit

Permalink
Merge branch 'master' into dev-new
Browse files Browse the repository at this point in the history
  • Loading branch information
majek committed Nov 15, 2012
2 parents 1eb96e3 + 10d2327 commit e6489c8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -11,7 +11,7 @@ Work in progress:


* [SockJS-ruby](https://github.com/sockjs/sockjs-ruby) * [SockJS-ruby](https://github.com/sockjs/sockjs-ruby)
* [SockJS-netty](https://github.com/cgbystrom/sockjs-netty) * [SockJS-netty](https://github.com/cgbystrom/sockjs-netty)
* [SockJS-gevent](https://github.com/sdiehl/sockjs-gevent) * [SockJS-gevent](https://github.com/sdiehl/sockjs-gevent) ([SockJS-gevent fork](https://github.com/njoyce/sockjs-gevent))
* [pyramid-SockJS](https://github.com/fafhrd91/pyramid_sockjs) * [pyramid-SockJS](https://github.com/fafhrd91/pyramid_sockjs)
* [wildcloud-websockets](https://github.com/wildcloud/wildcloud-websockets) * [wildcloud-websockets](https://github.com/wildcloud/wildcloud-websockets)
* [SockJS-cyclone](https://github.com/flaviogrossi/sockjs-cyclone) * [SockJS-cyclone](https://github.com/flaviogrossi/sockjs-cyclone)
Expand Down

0 comments on commit e6489c8

Please sign in to comment.