maxwell e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import ... Conflicts: app/controllers/users_controller.rb		2010-10-13 23:09:48 -07:00
..
controllers	the invited user keeps track of who invited them, limit on invites,	2010-10-13 16:52:33 -07:00
fixtures	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-27 15:39:50 -07:00
helpers	Add or later to license notice	2010-10-07 16:25:34 -07:00
lib	MS DG; basic view support; it works, but it is ugly	2010-10-13 18:42:24 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora into import	2010-10-13 23:09:48 -07:00
factories.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
misc_spec.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
spec_helper.rb	DG MS; filter_post method, aspect_clean method	2010-10-13 13:10:08 -07:00
user_encryption_spec.rb	almost all green	2010-10-12 11:17:29 -07:00