Ariel Zavala d7e9744e84 Merge branch 'master' of http://github.com/diaspora/diaspora		2010-09-16 23:53:18 -04:00
..
controllers	Merge branch 'master' of http://github.com/diaspora/diaspora	2010-09-16 23:53:18 -04:00
helpers	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-16 16:06:28 -07:00
models	README.md	2010-09-16 18:48:18 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	Fixed album controller errors	2010-09-16 23:35:57 -04:00