Skip to content
Snippets Groups Projects
Commit 3b01e86f authored by danielvincent's avatar danielvincent
Browse files

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

parents 6f282e77 35ebe38c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
.gitignore
+ 1
− 0
View file @ 3b01e86f
......@@ -3,6 +3,7 @@ config/app_config.yml
config/fb_config.yml
config/initializers/secret_token.rb
.bundle
vendor/bundle/*
# Generated files
log/*
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment