From fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sun, 07 Jun 2015 12:16:19 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 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