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