Nael e5732455c4 Merge branch 'master' of mojotrollz.eu:hosting ...

Conflicts:
	uVote/uVote/page/default_bulletin/default_bulletin.php
	uVote/uVote/page/default_page/default_page.php
	uVote/uVote/page/default_page/vote.tpl

2014-03-03 11:02:35 +01:00

..

api

stats voteweight,

2014-02-24 15:27:55 +01:00

dbd

stats voteweight,

2014-02-24 15:27:55 +01:00

img

stats voteweight,

2014-02-24 15:27:55 +01:00

page

Merge branch 'master' of mojotrollz.eu:hosting

2014-03-03 11:02:35 +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