summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2016-08-17 22:17:25 +0200
committerChristian Pointner <equinox@spreadspace.org>2016-08-17 22:17:25 +0200
commit95b6650c544aca5443700ffba5f978617b9be6d4 (patch)
treeba8e01b48d37e080aef547a83c4be21cc2bfc6b1 /.gitignore
parent14bb9bdbecb07c01242e004442823e8cb153af4d (diff)
parentbed226f38fe11e04556ceef5b0d685a8f4e27edb (diff)
Merge branch 'master' into stable
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4671496..40525d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
+/db-config.php
/InfoRouter.plain
/topology.dot.plain
-