Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
commit
35a59d3982
1 changed files with 1 additions and 1 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -13,7 +13,7 @@ public/stylesheets/ui.css
|
||||||
|
|
||||||
# Uploded files and local files
|
# Uploded files and local files
|
||||||
public/uploads/*
|
public/uploads/*
|
||||||
public/source.tar
|
public/source.tar*
|
||||||
tmp/**/*
|
tmp/**/*
|
||||||
db/*.sqlite3
|
db/*.sqlite3
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue