Commit df19dbdc authored by Davve's avatar Davve

解决冲突

parents 96b89357 5bc51f02
......@@ -19,7 +19,6 @@ from .upload import *
from .token import *
from .face_star import *
from .advertise import *
from .commons import *
urlpatterns = [
# 登陆,注销相关
......
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