Shadow 15c6bb2fea Merge branch 'master' of https://github.com/Shadowss/TravianZ ...

Conflicts:
	Admin/Templates/config.tpl
	Admin/Templates/editServerSet.tpl

2014-03-10 08:39:06 +02:00

..

gpack/travian_default/img/t

reports

2014-03-06 08:58:27 +02:00

img

reports

2014-03-06 08:58:27 +02:00

Mods

update

2014-02-21 15:29:41 +02:00

Templates

Merge branch 'master' of https://github.com/Shadowss/TravianZ

2014-03-10 08:39:06 +02:00

.htaccess

finish hero_full.php

2013-06-16 10:38:34 +03:00

admin.php

credits

2014-03-05 09:01:50 +02:00

ajax.js

finish hero_full.php

2013-06-16 10:38:34 +03:00

database.php

credits

2014-03-05 09:01:50 +02:00

error_log

admin panel fix

2014-01-23 14:45:37 +02:00

function.php

credits

2014-03-05 09:01:50 +02:00

welcome.tpl

finish hero_full.php

2013-06-16 10:38:34 +03:00