maxwell c34f5e5ee0 Merge branch 'master' of github.com:diaspora/diaspora_rails		2010-07-23 21:20:05 -07:00
..
controllers	No file is now complained about in the view	2010-07-23 16:57:34 -07:00
helpers	little things	2010-07-23 21:11:21 -07:00
models	MS should be able to unsubscribe from an ostatus feed now, now it needs to be put in the controller	2010-07-23 21:16:36 -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	little things	2010-07-23 21:11:21 -07:00