github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github/dev' into dev

pull/1044/head
ibuler 2018-02-26 11:38:20 +08:00
parent f1c386714d 5193ba2e39
commit 1f3b11a223
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/deb_requirements.txt
View File

@ -1 +1 @@
libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk python-dev openssl libssl-dev libldap2-dev libsasl2-dev sqlite gcc automake

2
run_server.py
View File

@ -13,7 +13,7 @@ from apps import __version__
try: try:
from config import config as CONFIG from config import config as CONFIG
except ImportError: except ImportError:
CONFIG = type('_', (), {'__getattr__': None})() CONFIG = type('_', (), {'__getattr__': lambda *arg: None})()
os.environ["PYTHONIOENCODING"] = "UTF-8" os.environ["PYTHONIOENCODING"] = "UTF-8"