wenxianping 24f3cf564d Merge branch 'dev' ... # Conflicts: # config/ticket_config.yaml # init/login.py # init/select_ticket_info.py # tkcode		2018-01-29 22:04:39 +08:00
..
__init__.py	更改冗余目录结构	2018-01-08 15:28:10 +08:00
configCommon.py	增加日志	2018-01-24 12:56:18 +08:00
emailConf.py	1、修改登录接口逻辑，暂定办法	2018-01-22 22:01:57 +08:00
logger.py	增加日志	2018-01-24 12:56:18 +08:00
ticketConf.py	Merge branch 'master' into dev	2018-01-24 22:50:22 +08:00
ticket_config.yaml	Merge branch 'dev'	2018-01-29 22:04:39 +08:00
urlConf.py	1、增加cdn轮训功能	2018-01-29 21:59:01 +08:00