summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjahnk <tjahnk@users.noreply.github.com>2017-11-08 11:37:04 +0100
committerGitHub <noreply@github.com>2017-11-08 11:37:04 +0100
commit87e4a9ee6596ed2ef0ea28e18f09f803ecd207fb (patch)
tree2fa26d4198d051a80e2e7865aac18d10c7bfc9cd
parentd51b0e0b7ef6dab5bc938a6bfea630426108b4d8 (diff)
parentf344b66a5750fce79701cda557a77ebd9e281317 (diff)
Merge pull request #22 from iotbzh/tobias-dev
Update submodules / ignores 3rdparty/mxml folder
-rw-r--r--.gitignore1
m---------conf.d/app-templates0
2 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 04fd8c9..e86671c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ Install/
.stfolder
conf.d/packaging
conf.d/*.env
+3rdparty/mxml/
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject 17456de19e50f63348d42c4ae26dda156ddec53
+Subproject c881d86fc8852a2b2215856d3503aba192c0f4e