diff options
| author | Raphael <raphael@joindiaspora.com> | 2010-09-25 02:50:48 +0400 |
|---|---|---|
| committer | Raphael <raphael@joindiaspora.com> | 2010-09-25 02:50:48 +0400 |
| commit | 9d2ee2f961c594d64090025bc61e8c49c0c41a22 (patch) | |
| tree | b12f1aaba6a89a98e5d506e640816e71166d917f /.gitignore | |
| parent | d9688324f87b0e2323a112005697e868328180e8 (diff) | |
| parent | 3b4b4f4ed37574bf1c803bfd6e8fbda53a0695ab (diff) | |
Merge branch 'master' into HEAD
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 90ed99d1f..4a78ed39f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ public/uploads/* .rvmrc .DS_Store config/app_config.yml +bin/* +nbproject |