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

Conflicts:
	Admin/admin.php

2014-01-31 08:20:42 +02:00

..

Mods

removed errorlogs and populate oasis

2013-08-13 10:10:50 +03:00

Templates

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

2014-01-31 08:20:42 +02:00

.htaccess

finish hero_full.php

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

admin.php

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

2014-01-31 08:20:42 +02:00

ajax.js

finish hero_full.php

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

database.php

Update database.php

2013-11-19 12:28:42 +02:00

error_log

admin panel fix

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

function.php

fix delete player in admin panel

2013-09-12 21:23:24 +03:00

welcome.tpl

finish hero_full.php

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