Claudius Coenen 64b07fca55 Merge branch 'master' of http://github.com/diaspora/diaspora into locale-de

2010-09-17 00:23:43 +02:00

..

controllers

Merge branch 'master' of http://github.com/diaspora/diaspora into locale-de

2010-09-17 00:23:43 +02:00

helpers

object_path shouldn't create links to users

2010-09-16 14:51:27 -07:00

models

MS fixed the nil hostname on user

2010-09-16 14:38:24 -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