summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-06-29 18:42:02 +0000
committerintrigeri <intrigeri@boum.org>2016-06-29 18:42:02 +0000
commitf035fd1621c8f0fa5eeeacd89ba52742c540cb7c (patch)
treed36a1e4d388dd024ca63469fa260306564734e02 /.gitignore
parent5102b7863b09e58bdd712c9019885313270299ce (diff)
parentbc73809d7b33541b50ba9f38cb3bf1dd2237b98f (diff)
Merge remote-tracking branch 'shared/master' into bugfix/drop-obsolete-code-and-global-variable-in-apt-cron
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a54aa97..3b626b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
/spec/fixtures/modules/*
!/spec/fixtures/modules/apt
!/spec/fixtures/modules/apt/*
+/log
/.vagrant/
/.bundle/
/coverage/