maxwell d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor ... Conflicts: app/controllers/publics_controller.rb app/models/user.rb		2010-08-09 17:31:46 -07:00
..
environments	replaced the functionality with openssl, didn't do the encryption spec	2010-08-04 20:32:15 -07:00
initializers	Changed info logging to debug logging almost everywhere	2010-08-09 14:39:37 -07:00
locales	added authentication via devise	2010-06-12 21:56:50 -07:00
sprinkle	Getting the deployment changes from master	2010-08-08 21:24:34 -07:00
app_config.yml	RS, DG; Log files should now rotate	2010-08-09 14:27:17 -07:00
application.rb	MS mongomapper works kinda	2010-06-24 17:22:49 -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	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 17:31:46 -07:00
thin.yml	RS IZ Switching to production	2010-07-23 10:41:57 -07:00