From 80e18c2c0e2e08e1c4ffb792b731451835cf01d4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 04 Jul 2014 02:33:11 -0400
Subject: [PATCH] Merge branch 'unlimited_clients' into 'master'

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

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

--
Gitblit v1.9.1