Raphael 70a22ae839 Merge branch 'master' into HEAD ... Conflicts: app/models/post.rb app/models/user.rb config/initializers/socket.rb		2010-09-24 09:15:10 -07:00
..
bootstrap-fedora-diaspora.sh	added Fedora install information to README.md as well as a script for setting up a usable environment.	2010-09-16 13:08:30 +08:00
build	rechmoded build	2010-07-06 19:24:50 -07:00
rails	Basic 1.9.2 port	2010-09-16 14:41:33 +09:00
server	Added check to see if Mongod is running	2010-09-18 07:37:35 +08:00
websocket_server.rb	made websocket server host configurable	2010-09-19 09:57:57 +08:00