4 commits

Author	SHA1	Message	Date
Raphael	40435d6891	Commented out tests that require internets to function	2010-07-17 13:20:06 -07:00
maxwell	31629f8115	MS fixed webfinger spec regression	2010-07-16 23:11:23 -07:00
maxwell	f34e033bce	MS IZ getting the profile	2010-07-16 21:59:40 -07:00
maxwell	a742ef1253	Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: Gemfile	2010-07-16 21:33:57 -07:00