Raphael 2e8ecceaf7 Merge branch 'master' of github.com:diaspora/diaspora into production

2010-09-16 21:53:34 -07:00

..

controllers

fixed small issue in albums#update anad added corressponding controller test

2010-09-16 12:21:08 -03:00

fixtures

DG MS fixing webfinger, i hope to goodness

2010-09-15 13:28:06 -07:00

helpers

Cleanup stray whitespace

2010-09-16 10:07:59 +08:00

lib

Finish moving out websocket server, add task to start it

2010-09-16 21:42:16 -07:00

models

Merge branch 'master' of github.com:diaspora/diaspora into production

2010-09-16 16:19:48 -07:00

factories.rb

Merge branch 'master' of github.com:diaspora/diaspora into production

2010-09-16 16:19:48 -07:00

misc_spec.rb

Cleanup stray whitespace

2010-09-16 10:07:59 +08:00

spec_helper.rb

Merge branch 'master' of github.com:diaspora/diaspora into production

2010-09-15 22:37:05 -07:00

user_encryption_spec.rb

Cleanup stray whitespace

2010-09-16 10:07:59 +08:00