summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2020-03-15 13:05:50 -0400
committerDessalines <tyhou13@gmx.com>2020-03-15 13:05:50 -0400
commited0dd3b8c00d51989e8f652a3fa904c7b1eb7ec7 (patch)
treecdc79b3d4719b793a8c234337f1e32f8290148fe /.gitignore
parent74eae88e37d1ee5e4c74cdf7be9662f4b9626902 (diff)
parent1a7c6fbd324c662e682c491915f8995262c21d3d (diff)
Merge branch 'dev'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d823aaca..9f7fa1e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ docker/dev/env_deploy.sh
build/
.idea/
ui/src/translations
-docker/dev/volumes \ No newline at end of file
+docker/dev/volumes
+docker/federation-test/volumes