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
..
environments	Merge branch 'master' into HEAD	2010-09-24 09:15:10 -07:00
initializers	Merge branch 'master' into HEAD	2010-09-22 21:32:03 -07:00
locales	defaults doesn't really make sense when there's nothing else	2010-09-23 14:58:17 -07:00
sprinkle
app_config.yml.example	typo fix	2010-09-24 01:16:08 +08:00
application.rb	Merge branch 'master' into HEAD	2010-09-24 09:15:10 -07:00
boot.rb
deploy.rb	tiny typo	2010-09-21 17:40:43 -07:00
deploy_config.yml	deploy script now uses public url	2010-09-23 12:31:19 -07:00
environment.rb
routes.rb	Take out async controller until we actually put it in the app	2010-09-23 12:19:28 -07:00
selenium.yml
thin.yml	Move thin yml back to development mode	2010-09-20 12:51:47 -07:00