danielvincent 26a4dc76a6 Merge branch 'master' of github.com:diaspora/diaspora

2010-09-27 18:34:55 -07:00

..

diaspora

temp route for atom feed. also, public atom currently displays all posts.

2010-09-27 18:34:47 -07:00

mongo_mapper

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

salmon

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

tasks

db:reset should call db:seed:dev, not db:seed:tom

2010-09-27 16:54:42 -07:00

chrome_frame.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

diaspora.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

encryptable.rb

moved the private key into user where it belongs, two failing cucumber tests

2010-09-26 22:08:42 -07:00

encryptor.rb

moved the private key into user where it belongs, two failing cucumber tests

2010-09-26 22:08:42 -07:00

hcard.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00

message_handler.rb

Remove consecutive empty lines

2010-09-25 12:06:39 -04:00