danielvincent 8c92c31323 Merge branch 'master' of github.com:diaspora/diaspora		2010-10-19 12:29:34 -07:00
..
controllers	padding on stream fix. added add aspect button in aspect nav.	2010-10-19 12:10:22 -07:00
helpers	Beat Dan at bugfixing	2010-10-19 11:43:10 -07:00
models	Validate uniqueness of aspect name, 359	2010-10-19 12:23:24 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	fixed no friends/posts message positioning	2010-10-19 12:28:54 -07:00