summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-05-18 13:39:56 +0200
committervarac <varacanero@zeromail.org>2016-05-18 13:39:56 +0200
commitc046daea6d31e929eee45e47762240b800554d2f (patch)
treed83f557d027030021329b4f40150757948cb2c97 /.gitignore
parent22286f450bef6a28a08f5ff527e3a4f040fab4c3 (diff)
parent3e63ce3c71620433dc135959b2743aa010b28fe1 (diff)
Merge branch 'tests' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 30792935..146a1006 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/.vagrant
/puppet/modules/site_custom
+Gemfile.lock