summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-10-11 12:53:10 +0200
committerAzul <azul@leap.se>2012-10-11 12:53:10 +0200
commit09003d3d2df7c250d3a0b55e83094e5e27094859 (patch)
tree90d2a851cd558652121182937a5ec8373722cab0 /.gitignore
parent118d9ab5c9f4d7a82b7cf24774ef12d3c221f8ef (diff)
parent33ef3d2ac9a03b06ff29f1367c69731a89f1dfc7 (diff)
Merge branch 'release-0.1.0' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index eb3489a..3567ebd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,9 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
+/pkg
+/*/pkg
+/log
+*/Gemfile.lock
+test/dummy/log/*
+test/dummy/tmp/*