Ariel Zavala 7bb3d9c87a Merge branch 'master' of http://github.com/diaspora/diaspora		2010-09-17 17:21:29 -04:00
..
controllers	Merge branch 'master' of http://github.com/diaspora/diaspora	2010-09-17 17:21:29 -04:00
helpers	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-16 16:06:28 -07:00
models	Give slightly more specific error message	2010-09-17 12:49:49 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	added photo view translations	2010-09-17 11:34:45 -04:00