From 95491115a4a50a2345238a775e79f4932bf86175 Mon Sep 17 00:00:00 2001
From: Naeltard <t.rechel@gmx.de>
Date: Fri, 23 Jan 2015 17:21:11 +0100
Subject: [PATCH] Merge branch 'master' of mojotrollz.eu:hosting

Conflicts:
	Neopolimatrix/neopolimatrix/page/default_page/tpl/default_page.tpl
---
 uVote/page/default_page/page.tpl       | 2 +-
 uVote/page/user_list_active/active.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/uVote/page/default_page/page.tpl b/uVote/page/default_page/page.tpl
index fd3a5e6..11c268f 100644
--- a/uVote/page/default_page/page.tpl
+++ b/uVote/page/default_page/page.tpl
@@ -57,7 +57,7 @@
             <div id="site-content">
 
                 <div id="user_main"></div>
-
+                
                 <div id="user_list"></div>
                 
             </div>
diff --git a/uVote/page/user_list_active/active.tpl b/uVote/page/user_list_active/active.tpl
index f2cef67..3955133 100644
--- a/uVote/page/user_list_active/active.tpl
+++ b/uVote/page/user_list_active/active.tpl
@@ -1 +1 @@
-${votelist}
\ No newline at end of file
+${votetlist}
\ No newline at end of file