ilya 55b4d4758f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots ... Conflicts: app/models/user.rb spec/models/user_spec.rb		2010-08-17 22:58:46 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 22:58:46 -07:00
helpers	DG IZ posts by the user get websocketed on the group page and albums	2010-08-17 18:06:35 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 22:58:46 -07:00
uploaders	minor changes	2010-08-14 00:21:10 -07:00
views	Merging in socket-group	2010-08-17 20:30:30 -07:00