maxwell b155d07abd Merge branch 'master' of github.com:diaspora/diaspora		2010-09-16 14:38:32 -07:00
..
controllers	Merge branch 'master' of http://github.com/fbrubacher/diaspora	2010-09-16 12:14:11 -07:00
helpers	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
models	MS fixed the nil hostname on user	2010-09-16 14:38:24 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	websocket js should honor app socket port configuration	2010-09-17 03:11:11 +08:00