danielvincent 66ec5f0570 Merge branch 'master' of github.com:diaspora/diaspora		2010-10-05 17:00:20 -07:00
..
controllers	public fix	2010-10-05 16:28:01 -07:00
helpers	added a warning, moved connected as into a partial, removed the	2010-09-27 16:31:19 -07:00
models	self reference in atom	2010-10-05 16:59:55 -07:00
uploaders	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-05 16:58:06 -07:00