Commit c7ce14cf authored by jacotsu's avatar jacotsu
Browse files

Merge branch 'master' into 'master'

# Conflicts:
#   uus/
parents 0b6dd65d c6394c65
__all__ = ('app', 'redis_store', 'management_cli')
import os
import re
......@@ -159,7 +157,6 @@ def redirect(path):
return flask.abort(404)
#from .management_cli import *
if __name__ == "__main__":
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment