Ariel Zavala e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red		2010-09-19 11:16:00 -04:00
..
controllers	merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two)	2010-09-18 02:21:45 -04:00
helpers	Added I18n translations to helpers	2010-09-17 15:26:31 -04:00
models	case insensitivity on search	2010-09-18 17:21:18 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	Merged with diaspora; fixed conflicts; only 2 red	2010-09-19 11:16:00 -04:00