danielvincent 6531a27594 Merge branch 'master' of github.com:diaspora/diaspora

2010-10-07 15:22:14 -07:00

..

controllers

DG MS; test for users#export

2010-10-07 15:22:03 -07:00

helpers

added a warning, moved connected as into a partial, removed the

2010-09-27 16:31:19 -07:00

models

Run whitespace:cleanup

2010-10-07 10:47:37 -07:00

uploaders

storage isn't required here since is set in initializer

2010-09-26 11:04:19 -05:00

views

DG MS; test for users#export

2010-10-07 15:22:03 -07:00