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

..

api

comment

2014-03-11 00:11:26 +01:00

dbd

Merge branch 'master' of mojotrollz.eu:hosting

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

img

Merge branch 'master' of mojotrollz.eu:hosting

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

page

Merge branch 'master' of mojotrollz.eu:hosting

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

path

state

2014-01-24 22:20:25 +01:00

sai

uvote backend

2014-02-19 22:32:14 +01:00

src

updated system reference

2013-11-22 02:20:44 +01:00

autoload.inc.php

had to make state

2014-01-20 13:09:39 +01:00