Raphael 1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production		2010-09-15 11:01:11 -07:00
..
controllers	License notices replaced	2010-09-15 10:58:48 -07:00
fixtures	MS IZ added friend redirect, and moved the webfinger responces to fixture directory	2010-09-14 11:58:40 -07:00
helpers	License notices replaced	2010-09-15 10:58:48 -07:00
lib	License notices replaced	2010-09-15 10:58:48 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 11:01:11 -07:00
factories.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 11:01:11 -07:00
misc_spec.rb	License notices replaced	2010-09-15 10:58:48 -07:00
spec_helper.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 11:01:11 -07:00
user_encryption_spec.rb	License notices replaced	2010-09-15 10:58:48 -07:00