ilya 74c70d9410 Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/models/user.rb spec/lib/diaspora_parser_spec.rb		2010-08-16 18:18:30 -07:00
..
controllers	Merging in friend-refactor...	2010-08-16 15:35:14 -07:00
helpers	Call right method in dev_utilities, clear junk out of comments helper	2010-08-16 12:45:31 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-16 18:18:30 -07:00
uploaders	minor changes	2010-08-14 00:21:10 -07:00
views	DG IZ added an error message on request delete	2010-08-16 15:08:05 -07:00