Griatch a648433db8 Merge conflicts against master, including cmdhandler support for direct cmdobject input together with prefix-ignore mechanism from devel.		2017-04-01 16:08:23 +02:00
..
migrations	Adding migrations for django1.8.	2015-04-04 00:08:51 +02:00
__init__.py	Made Evennia run with Django 1.9	2016-02-18 10:12:42 +01:00
admin.py	Fold long lines, PEP 8 whitespace	2017-04-01 14:51:25 +02:00
manager.py	Fold long lines, PEP 8, comparision to None	2017-04-01 14:55:02 +02:00
models.py	Remove an extra quote marker typo.	2017-04-01 14:44:46 +02:00
objects.py	Merge conflicts against master, including cmdhandler support for direct cmdobject input together with prefix-ignore mechanism from devel.	2017-04-01 16:08:23 +02:00