Ariel Zavala b727fe42f5 Merge branch 'master' of http://github.com/diaspora/diaspora		2010-09-16 18:56:02 -04:00
..
controllers	Merge branch 'master' of http://github.com/fbrubacher/diaspora	2010-09-16 12:14:11 -07:00
helpers	object_path shouldn't create links to users	2010-09-16 14:51:27 -07:00
models	applying this change from wiki, thanks astronouth7303	2010-09-16 15:04:29 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	Added localizations that I had missed	2010-09-16 15:55:54 -04:00