From c5c7a913f16f5ddbf4ff44d6db7bdfcd650cecaa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:43:31 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 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