summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-05-11 11:01:46 +0000
committerintrigeri <intrigeri@boum.org>2015-05-11 11:01:46 +0000
commit1afd41c255f31a2ddeaac22efc690a6b1c25538f (patch)
treea56b9dc57581e3093a764983d417c61f1c4f8324 /.gitignore
parentea1dd0851dbc24b9556ce2c1564aa935efd2fbcf (diff)
parentebe57d1f2d949393344b2425fc27e5aa1dd38382 (diff)
Merge remote-tracking branch 'origin/testing' into test/8950-fs-shares-from-temp-dir
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 8fbbaf7..29a78f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,4 +49,4 @@
# The test suite's local configuration files
/features/config/local.yml
-/features/config/local.d/
+/features/config/*.d/