Nael 2c76fb1675 Merge branch 'master' of mojotrollz.eu:hosting ...

Conflicts:
	uVote/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php
	uVote/uVote/page/user_main_urVote/user_main_urVote.php

2014-02-17 01:06:21 +01:00

..

api

bt data input

2014-02-17 01:02:49 +01:00

dbd

bt data input

2014-02-17 01:02:49 +01:00

img

bt data input

2014-02-17 01:02:49 +01:00

page

Merge branch 'master' of mojotrollz.eu:hosting

2014-02-17 01:06:21 +01:00

path

state

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

sai

bt data input

2014-02-17 01:02:49 +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