maxwell 51b2737dde fixed some album stuff		2010-08-24 15:21:27 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-08-24 14:45:04 -07:00
helpers	Render nothing on status_messages create, Websockets now honestly	2010-08-24 14:36:03 -07:00
models	fixing merge confilts	2010-08-24 14:50:01 -07:00
uploaders	Photo filename is now better	2010-08-23 15:10:19 -07:00
views	fixed some album stuff	2010-08-24 15:21:27 -07:00