danielvincent 65ffe2ecdd Merge branch 'master' of github.com:diaspora/diaspora		2010-10-20 12:19:24 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 12:19:24 -07:00
helpers	Beat Dan at bugfixing	2010-10-19 11:43:10 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 12:19:24 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	make profile button on photo show page. (removed clean hash on usercontroller)	2010-10-20 12:19:06 -07:00