diaspora/spec/fixtures
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
..
button.png
evan_hcard
fb_status
finger_xrd
hcard_response
host_xrd
msg.xml
msg.xml.clear.asc
msg.xml.detached.asc
msg.xml.normal.asc
nonseed_finger_xrd