Merge branch 'master' of mojotrollz.eu:hosting

Conflicts: Neopolimatrix/neopolimatrix/page/default_page/tpl/default_page.tpl
2015-01-23 17:21:11 +01:00 · 2015-01-23 17:21:11 +01:00 · 95491115a4
commit 95491115a4
parent 589224566a
2 changed files with 2 additions and 2 deletions
--- 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>
--- a/uVote/page/user_list_active/active.tpl
+++ b/uVote/page/user_list_active/active.tpl
@ -1 +1 @@
-${votelist}
+${votetlist}