Changeset [b9c2c1b87bcd13eb73921929ddcf1997e2784ed5] by Rusty Klophaus
Revision b9c2c1b87bcd13eb73921929ddcf1997e2784ed5,
committed by Rusty Klophaus
· November 10th, 2010 @ 09:48 AM
Merge branch 'master' of https://github.com/ghaskins/nitrogen into ghaskins-master
Conflicts:
apps/nitrogen/www/nitrogen.js
https://github.com/rklophaus/nitrogen/commit/b9c2c1b87bcd13eb739219...
3 changed files
-
M
apps/nitrogen/ebin/nitrogen.app -
M
apps/nitrogen/www/nitrogen.js -
M
apps/simple_bridge/src/yaws_bridge_modules/yaws_request_bridge.erl