Changeset [6a492c30856cc5ebce35d9b4eabb72a340e32920] by Martin Scholl
June 30th, 2010 @ 03:03 AM
Merge branch 'master' of git.gi-trac.gi.net:/opt/git/repos/ms/nitrogen
Conflicts:
apps/nitrogen/ebin/nitrogen.app
apps/simple_bridge/ebin/simple_bridge.app
http://github.com/rklophaus/nitrogen/commit/6a492c30856cc5ebce35d9b...
Committed by Martin Scholl
- M apps/nitrogen/ebin/nitrogen.app
- M apps/simple_bridge/ebin/simple_bridge.app
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
Nitrogen Web Framework for Erlang