Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts: # NewMediaMonitoring/urls.py
This commit is contained in:
parent
5ce238d69b
commit
80ae500045
|
@ -2,5 +2,6 @@
|
||||||
.venv/
|
.venv/
|
||||||
.media/
|
.media/
|
||||||
*/__pycache__/
|
*/__pycache__/
|
||||||
|
*/*.pyc
|
||||||
*/migrations
|
*/migrations
|
||||||
NewMediaMonitoring/local_settings.py
|
NewMediaMonitoring/local_settings.py
|
||||||
|
|
Loading…
Reference in New Issue