summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-06-29 17:48:14 +0000
committerintrigeri <intrigeri@boum.org>2016-06-29 17:48:14 +0000
commit2ab9739d5a2595d2f72e6deb246778d619819270 (patch)
tree9b78ad7d7511e8e4851fb2b1026ecb785e9545ca /.gitignore
parente70a6712d31e91ecbf71f4de841735c3b36193ba (diff)
parent2bbfe8cab9ba8125feb9f54865e3025bf4d355ee (diff)
Merge remote-tracking branch 'shared/master' into bugfix/reboot-required-jessie
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/