merge: 合并V2到master
# Conflicts: # .gitignore # README.md # config/asgi.py # config/settings.py # config/urls.py # config/wsgi.py # manage.py # requirements.txt # templates/base.html # tests/conftest.py
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -30,8 +30,8 @@ staticfiles/
|
||||
.pytest_cache/
|
||||
.coverage
|
||||
htmlcov/
|
||||
.tmp/
|
||||
|
||||
# OS
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
|
||||
|
||||
Reference in New Issue
Block a user