maxwell 495154b2b5 Merge branch 'master' of github.com:diaspora/diaspora		2011-01-21 11:15:40 -08:00
..
controllers	getting rid of gruff and it's imagemagic deps. made graphs on stats pending.	2011-01-21 11:11:58 -08:00
helpers	added views and graph generation for statistics	2011-01-21 10:29:07 -08:00
mailers	Merge almost complete, 4 failures	2011-01-14 16:00:10 -08:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2011-01-21 11:15:40 -08:00
uploaders	remove s3 setting	2011-01-17 16:46:39 -08:00
views	getting rid of gruff and it's imagemagic deps. made graphs on stats pending.	2011-01-21 11:11:58 -08:00