Ariel Zavala db41bcc144 Merge branch 'locale-de' of http://github.com/ccoenen/diaspora		2010-09-16 21:09:11 -04:00
..
controllers	Merge branch 'locale-de' of http://github.com/ccoenen/diaspora	2010-09-16 21:09:11 -04:00
helpers	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-16 16:06:28 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-16 16:06:28 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	merge with diaspora and resolved a conflict	2010-09-16 20:42:45 -04:00