bob
/
newmediamonitoring
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring 

# Conflicts:
#	NewMediaMonitoring/urls.py
This commit is contained in:
Bob 2020-09-18 14:46:01 +08:00
parent cd4c5a4cdf
commit 5ce238d69b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,5 @@
.venv/ .venv/
.media/ .media/
*/__pycache__/ */__pycache__/
*/*.pyc
*/migrations */migrations
NewMediaMonitoring/local_settings.py NewMediaMonitoring/local_settings.py