summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPaul Bütow <pbuetow@mimecast.com>2018-12-27 09:28:07 +0000
committerPaul Bütow <pbuetow@mimecast.com>2018-12-27 09:28:07 +0000
commitba7c846a90a368c46915078f20da2426539318f9 (patch)
treeb2202208694c534f66681c6f80662094dd72c1a0 /.gitignore
parent160cdff37109bbc58a1b02a6e6d54b55afad5130 (diff)
parentc70afeb9d36d3582e97b20650df2320b19249095 (diff)
Merge branch 'next-release' into 'master'0.5
Merge candidate for release 0.5 to master See merge request Storage/ioriot!1
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 07f2f4b..1646026 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ docs/latex/
ioriot/ioriot
ioriot/tags
systemtap/downloads/
+docker/
+Dockerfile