summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-08-13 23:17:50 +0300
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-08-13 23:17:50 +0300
commit3d086d18a2639a76c4739b6ca7ca06416356c706 (patch)
tree5c9e122ae7e84b8013e8a742714a5779f871f6ad /.gitignore
parentf589682b0840aab0624122052eb863cf8dc3a0b9 (diff)
parentbc70e6ae115beb469541c12014ffdecc01a1e50c (diff)
Merge branch 'master' into flat-api
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 14b2f25e..fef0da65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ _mailinglist
.cache/
.idea/
config.json
+test.json