diff options
| author | Azul <azul@leap.se> | 2012-12-07 08:28:23 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-07 08:28:23 +0100 |
| commit | 1ec55c4f562a4fdd57c50077ff286ef08e9978a1 (patch) | |
| tree | 16203d2ca4f32e24d38fef6062aa9534cecb3bfe /.gitignore | |
| parent | effa6b0f84cfe954cc9dd73f592663b743b0d857 (diff) | |
| parent | a3dce077881c7e97090e5e560b1fb004952d5b23 (diff) | |
Merge branch 'develop'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -13,9 +13,11 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp +*~ /pkg /*/pkg /log +Gemfile.lock */Gemfile.lock test/dummy/log/* test/dummy/tmp/* |