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

This commit is contained in:
danielvincent 2010-10-15 14:22:43 -07:00
commit 3b01e86f90

1
.gitignore vendored
View file

@ -3,6 +3,7 @@ config/app_config.yml
config/fb_config.yml
config/initializers/secret_token.rb
.bundle
vendor/bundle/*
# Generated files
log/*