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 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
fb_status added a fb_status model & parser method 2010-09-24 14:41:31 -07:00
finger_xrd MS IZ added friend redirect, and moved the webfinger responces to fixture directory 2010-09-14 11:58:40 -07:00
hcard_response Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
host_xrd Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
msg.xml
msg.xml.clear.asc DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
msg.xml.detached.asc
msg.xml.normal.asc
nonseed_finger_xrd MS IZ added friend redirect, and moved the webfinger responces to fixture directory 2010-09-14 11:58:40 -07:00