Skip to content

Commit 1642b80

Browse files
committed
Merge branch 'master' of https://gitee.com/bukun/TorCMS
2 parents 3b512f1 + fe0cbf8 commit 1642b80

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,10 @@ gh-pages
106106
tags
107107

108108
# for Django
109-
!administor/**/migrations/__init__.py
110109
migrations/
111110
????_initial.py
111+
!admin_torcms/migrations/__init__.py
112+
112113
# Django admin static files.
113114
static/admin
114115

admin_torcms/migrations/__init__.py

Whitespace-only changes.

docker/Debian/Dockerfile_deb11

-2
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,3 @@ RUN /vpy/bin/python3 -m pip install -r doc/requirements.txt
5151
RUN /vpy/bin/python3 -m pip install -r doc/requirements-dev.txt
5252
RUN /vpy/bin/python3 -m pip install email_validator django wtforms
5353

54-
55-

0 commit comments

Comments
 (0)