diff options
| author | Raphael <raphael@joindiaspora.com> | 2010-10-20 20:51:55 +0400 |
|---|---|---|
| committer | Raphael <raphael@joindiaspora.com> | 2010-10-20 20:51:55 +0400 |
| commit | fd8028db3391da38a8991cb5340814eca522d73d (patch) | |
| tree | 1721ea0d9fb5939fcd677ab1619487c2599d5a61 /.gitignore | |
| parent | 1481056af23ed7dd70eed73a847d40fbe2d3ba2d (diff) | |
Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 1481056af23ed7dd70eed73a847d40fbe2d3ba2d.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 379d97a20..a17dc3a1b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ public/stylesheets/ui.css # Uploded files and local files public/uploads/* -public/source.tar +public/source.tar* tmp/**/* db/*.sqlite3 |