Merge branch 'develop' into refresh
Conflicts: core/config.py plugins/util/color.py plugins/util/formatting.py
This commit is contained in:
commit
aa8ab33ccb
31 changed files with 113 additions and 86 deletions
|
@ -1,4 +1,5 @@
|
|||
import http, web
|
||||
import http
|
||||
import web
|
||||
|
||||
|
||||
def eval_py(code, paste_multiline=True):
|
||||
|
|
Reference in a new issue