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

..

seeds

Merge branch 'master' of github.com:diaspora/diaspora into fb

2010-09-27 15:39:50 -07:00

schema.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

seeds.rb

Merging upstream changes

2010-09-25 15:57:59 -07:00