summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-10-28 08:53:08 +0100
committerAzul <azul@leap.se>2013-10-28 08:53:08 +0100
commit630b6c603594df8a9fa99555928ca68df8e8d8fa (patch)
tree3ca6f34a3cb713d02e30748e86acf81655694df6 /.gitignore
parent7abdb17fef4c48dc62621cb10062f14379039cdf (diff)
parent12f3d31e14fed756e909c8a656b00f92a9a62234 (diff)
Merge branch 'feature/4109-https-sources' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 84acd8d..f65233f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@
/pkg
/*/pkg
/log
-Gemfile.lock
*/Gemfile.lock
test/dummy/log/*
test/dummy/tmp/*