summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2012-12-22 04:37:24 -0800
committerazul <azul@riseup.net>2012-12-22 04:37:24 -0800
commit6e90c173662583ca392ca1cefa7e7dcdc92dbf13 (patch)
tree7195099649b50a95feea1ee10a214416c31ca59b /.gitignore
parentb23a7999dfc3e38e0f0ea6a1a3d4fd1e86b358ca (diff)
parent54037816896a9347c5894ad8260e440bba43d14f (diff)
Merge pull request #8 from leapcode/feature/use-default-config-file
Use two config files - one for defaults that is always present and one to overwrite these
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 974d05e..3b31e0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ public/assets/*
public/ca.crt
public/config/*
public/provider.json
+config/config.yml