Merge with develop and fix merge conflicts

This commit is contained in:
Griatch 2018-10-01 20:58:16 +02:00
commit 72f4fedcbe
148 changed files with 20005 additions and 2718 deletions

View file

@ -1,10 +1,15 @@
# Evennia dependencies, for Linux/Mac platforms
django > 1.10, < 2.0
twisted >= 17.0.0
mock >= 1.0.1
pillow == 2.9.0
# general
django > 1.11, < 2.0
twisted >= 18.0.0, < 19.0.0
pillow == 5.2.0
pytz
future >= 0.15.2
django-sekizai
inflect
autobahn >= 17.9.3
# testing
mock >= 1.0.1
anything