maxwell e7afebece8 Merge branch 'master' of github.com:diaspora/diaspora

2010-09-16 15:07:02 -07: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

websocket js should honor app socket port configuration

2010-09-17 03:11:11 +08:00