danielvincent 33e478229e Merge branch 'master' of github.com:diaspora/diaspora		2010-10-05 13:40:10 -07:00
..
controllers	pubsub support	2010-10-05 13:39:56 -07:00
helpers	added a warning, moved connected as into a partial, removed the	2010-09-27 16:31:19 -07:00
models	pubsub support	2010-10-05 13:39:56 -07:00
uploaders	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
views	Fb friends are displayed only once	2010-10-05 13:00:42 -07:00