Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
commit
3b01e86f90
1 changed files with 1 additions and 0 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -3,6 +3,7 @@ config/app_config.yml
|
||||||
config/fb_config.yml
|
config/fb_config.yml
|
||||||
config/initializers/secret_token.rb
|
config/initializers/secret_token.rb
|
||||||
.bundle
|
.bundle
|
||||||
|
vendor/bundle/*
|
||||||
|
|
||||||
# Generated files
|
# Generated files
|
||||||
log/*
|
log/*
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue