summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-11-12 10:50:30 -0800
committerjessib <jessib@riseup.net>2012-11-12 10:50:30 -0800
commitdd26e22a3bcf0aebd16c518e44b8ab6a73bd7d0e (patch)
tree9b3efc7c43d88d161a81b7efd54b9f2e6c102a2f /.gitignore
parent347c1d73c855cfad8c37e8a0bd98a60831151812 (diff)
parentb9fb554ca4cb45233bd1323047b357f649bd495b (diff)
Merge branch 'develop' into help_develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index cdbdc16..fc7039e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,9 +17,10 @@
/pkg
/*/pkg
/log
+Gemfile.lock
*/Gemfile.lock
test/dummy/log/*
test/dummy/tmp/*
# Ignore configuration file.
-config/config.ymlGemfile.lock
+config/config.yml