ilya 08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb ... Conflicts: app/views/layouts/application.html.haml app/views/shared/_publisher.haml app/views/shared/_sub_header.haml app/views/users/edit.html.haml config/deploy_config.yml config/routes.rb		2010-09-27 15:39:50 -07:00
..
album.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
aspect.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
comment.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
fb_status.rb	passing the right things to the partial	2010-09-24 15:52:29 -07:00
person.rb	moved the private key into user where it belongs, two failing cucumber tests	2010-09-26 22:08:42 -07:00
photo.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
post.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
profile.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
request.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
retraction.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
status_message.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
user.rb	removed the encryption key= method, and user with private key factory	2010-09-27 10:10:54 -07:00