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:52:56 +08:00
parent e2c53a6d3c
commit a2787eeaa0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,7 @@
.idea/ .idea/
.venv/ .venv/
.media/ .media/
*/__pycache__/
*/*.pyc
*/migrations */migrations
NewMediaMonitoring/local_settings.py NewMediaMonitoring/local_settings.py