danielvincent b63b7fe482 Merge branch 'master' of github.com:diaspora/diaspora_rails		2010-07-23 19:44:41 -07:00
..
controllers	No file is now complained about in the view	2010-07-23 16:57:34 -07:00
helpers	Switching to Grid_FS	2010-07-23 14:32:55 -07:00
models	MS minor defaults change	2010-07-23 18:17:48 -07:00
uploaders	now should be saving to the directory without the wrong id in the name	2010-07-23 15:49:08 -07:00
views	took current user's name out of the layout	2010-07-23 19:44:34 -07:00