messerbill a79bc90933 Merge branch 'master' of mojotrollz.eu:hosting ...

Conflicts:
	uVote/uVote/dbd/qq/UVOTE_DATA_TEMP_VOTES.php
	uVote/uVote/dbd/qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php
	uVote/uVote/page/default_bulletin/bulletin.tpl
	uVote/uVote/page/default_page/full_vote.tpl
	uVote/uVote/page/default_page/js/loadtexts.js
	uVote/uVote/page/default_page/page.tpl
	uVote/uVote/page/default_page/vote.tpl
	uVote/uVote/page/default_register/register.tpl
	uVote/uVote/page/user_list_active/user_list_active.php
	uVote/uVote/page/user_list_ended/user_list_ended.php
	uVote/uVote/page/user_main_urVote/all_polls.tpl

2014-03-11 01:18:53 +01:00

..

all_polls.tpl

impressum &shitz

2014-03-07 03:10:17 +01:00

bt_to_user_overall.tpl

statistics for vote.tpl thx to rylon

2014-02-23 21:48:10 +01:00

overall_all_polls.tpl

impressum &shitz

2014-03-07 03:10:17 +01:00

urVote.tpl

fuck js

2014-03-08 21:35:41 +01:00

urvoteparties.tpl

bt to user

2014-02-19 22:00:21 +01:00

user_main_urVote.php

new stats, new texts, new awesome

2014-03-04 18:43:13 +01:00