From 484e593112e3752e1838e625d129d145e62bc331 Mon Sep 17 00:00:00 2001
From: Dominik Mueller <info@profi-webdesign.net>
Date: Thu, 23 Jan 2014 14:04:03 -0500
Subject: [PATCH] Merge branch 'vhostalias' of http://git.ispconfig.org/renky/ispconfig3 into vhostalias

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

diff --git a/interface/web/sites/lib/admin.conf.php b/interface/web/sites/lib/admin.conf.php
index a45d440..acb6c35 100644
--- a/interface/web/sites/lib/admin.conf.php
+++ b/interface/web/sites/lib/admin.conf.php
@@ -1,2 +1,2 @@
-<?php
-?>
\ No newline at end of file
+<?php
+?>

--
Gitblit v1.9.1