Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from development clone.

Browse source
This commit is contained in:
Griatch 2013-11-28 16:46:16 +01:00
commit c356267497
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/server/serversession.py
View file

@ -22,10 +22,9 @@ _GA = object.__getattribute__
_ObjectDB = None _ObjectDB = None
_OOB_HANDLER = None _OOB_HANDLER = None
# load optional out-of-band function module # load optional out-of-band function module (this acts as a verification)
OOB_PLUGIN_MODULE = settings.OOB_PLUGIN_MODULE OOB_PLUGIN_MODULES = [utils.mod_import(mod)
if OOB_PLUGIN_MODULE: for mod in make_iter(settings.OOB_PLUGIN_MODULES) if mod]
OOB_PLUGIN_MODULE = utils.mod_import(settings.OOB_PLUGIN_MODULE)
# i18n # i18n
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _