danielvincent 48e92c2c33 Merge branch 'master' of github.com:diaspora/diaspora		2010-10-08 14:07:05 -07:00
..
controllers	DG MS; moved change password to account page; fixed the styling on password inputs	2010-10-07 18:52:46 -07:00
helpers	Add or later to license notice	2010-10-07 16:25:34 -07:00
models	killed the public tab. made a broadcast button in everyone tab	2010-10-08 14:06:49 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-08 14:07:05 -07:00