From 7c2179f4b8604da1167b29ffb92041cf16fc4dbc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 13 Mar 2014 07:37:47 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

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

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

--
Gitblit v1.9.1