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
..
user	Refactor user specs to speed up spec runs.	2010-09-26 13:08:30 -07:00
album_spec.rb	Refactor Album spec	2010-09-17 16:41:58 -04:00
aspect_spec.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
comments_spec.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
fb_status_spec.rb	passing the right things to the partial	2010-09-24 15:52:29 -07:00
person_spec.rb	Replaced hardcoded '@example.com' with APP_CONFIG[:terse_pod_url]	2010-09-28 02:50:56 +08:00
photo_spec.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
post_spec.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
profile_spec.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
request_spec.rb	Big clean up: delete trailing whitespace	2010-09-26 12:48:40 -04:00
retraction_spec.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
status_message_spec.rb	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
user_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-26 13:08:56 -07:00