Raphael f66b5f4006 Merge branch 'master' of github.com:diaspora/diaspora into pivots ... Conflicts: app/controllers/users_controller.rb app/models/user.rb config/sprinkle/provision.rb		2010-08-19 16:09:08 -07:00
..
environments	Merge branch 'master' of github.com:diaspora/diaspora into pivots	2010-08-18 20:50:28 -07:00
initializers	Moving to file store	2010-08-18 16:37:05 -07:00
locales	added authentication via devise	2010-06-12 21:56:50 -07:00
sprinkle	Trying to merge in the pivots changes that we want in master	2010-08-18 21:10:42 -07:00
app_config.yml	RS, DG; Log files should now rotate	2010-08-09 14:27:17 -07:00
application.rb	one thing beta couldnt handle	2010-08-18 21:34:02 -07:00
boot.rb	playing	2010-06-18 23:47:42 -07:00
environment.rb	replaced the functionality with openssl, didn't do the encryption spec	2010-08-04 20:32:15 -07:00
routes.rb	Fixing users routes	2010-08-19 10:38:42 -07:00
selenium.yml	selenium, ymls, a sample test	2010-08-19 15:44:23 -07:00
thin.yml	conf changes, kill nginx with go_cold	2010-08-17 11:42:59 -07:00