Merge remote-tracking branch 'upstream/develop' into feature/refactor_config

Conflicts:
	headphones/__init__.py
	headphones/searcher.py
	headphones/webserve.py
This commit is contained in:
Jesse Mullan
2014-10-22 10:02:18 -07:00
669 changed files with 10344 additions and 1591 deletions
+1 -1
View File
@@ -52,7 +52,7 @@ def initialize(options=None):
'tools.encode.encoding': 'utf-8',
'tools.decode.on': True,
'log.screen': False,
'engine.autoreload_on': False,
'engine.autoreload.on': False,
}
if enable_https: