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

Conflicts:
	uVote/uVote/page/default_page/js/loadtexts.js

2013-07-06 19:01:31 +02:00

..

account_create.js

started working on account_create

2013-06-26 22:21:12 +02:00

loadtexts.js

Merge branch 'master' of mojotrollz.eu:hosting

2013-07-06 19:01:31 +02:00

timer.js

renamed ivote to uvote

2013-06-13 23:01:10 +02:00