Permalink
Browse files

Merge branch 'master' into expose_available_websockets

  • Loading branch information...
2 parents 1d515dd + 1bf2076 commit fea60e3107dee81650464c1fc574a21530e37a4d @davidw committed Jan 31, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 rebar.config
View
@@ -15,7 +15,7 @@
{gen_smtp, ".*", {git, "git://github.com/Vagabond/gen_smtp.git", {tag, "0558786233"}}},
{misultin, ".*", {git, "git://github.com/ostinelli/misultin.git", {tag, "misultin-0.9"}}},
{mochiweb, ".*", {git, "git://github.com/mochi/mochiweb.git", {tag, "v2.3.0"}}},
- {simple_bridge, ".*", {git, "git://github.com/choptastic/simple_bridge.git", {tag, "from-boss"}}},
+ {simple_bridge, ".*", {git, "git://github.com/nitrogen/simple_bridge.git", {tag, "2f39fa382d"}}},
{poolboy, ".*", {git, "git://github.com/devinus/poolboy.git", {tag, "855802e0cc"}}},
{cowboy, ".*", {git, "git://github.com/extend/cowboy.git", {tag, "0.6.0"}}},
{mochicow, ".*", {git, "git://github.com/benoitc/mochicow.git", {tag, "HEAD"}}}

0 comments on commit fea60e3

Please sign in to comment.