Merge branch 'master' of https://github.com/evader1337/TravianZ into evader1337-master

Browse Source

# Conflicts:
#	GameEngine/Database/db_MYSQL.php
#	Templates/Build/avaliable.tpl
#	Templates/Message/inbox.tpl

...

This commit is contained in:

Martin Ambrus

2017-08-28 14:18:24 +02:00

parent 1a4005cd67 cdfee7780b

commit 9261a4a4b2

93 changed files with 5041 additions and 9207 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

GameEngine/Automation.php

+212 -212

File diff suppressed because it is too large Load Diff