From dad105ff4110e29a584af3e5dc75c0f3cfcd0dce Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 29 Feb 2016 14:25:26 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/dns/lib/admin.conf.php |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/interface/web/dns/lib/admin.conf.php b/interface/web/dns/lib/admin.conf.php
new file mode 100644
index 0000000..acb6c35
--- /dev/null
+++ b/interface/web/dns/lib/admin.conf.php
@@ -0,0 +1,2 @@
+<?php
+?>

--
Gitblit v1.9.1