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

This commit is contained in:
danielvincent 2010-10-19 14:07:09 -07:00
commit 35a59d3982

2
.gitignore vendored
View file

@ -13,7 +13,7 @@ public/stylesheets/ui.css
# Uploded files and local files
public/uploads/*
public/source.tar
public/source.tar*
tmp/**/*
db/*.sqlite3