added merge migrations
This commit is contained in:
parent
bd3a809d85
commit
7e93aafc3f
14
apps/account/migrations/0015_merge_20191023_1317.py
Normal file
14
apps/account/migrations/0015_merge_20191023_1317.py
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
# Generated by Django 2.2.4 on 2019-10-23 13:17
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('account', '0014_merge_20191023_0959'),
|
||||
('account', '0012_merge_20191015_0912'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
]
|
||||
15
apps/news/migrations/0025_merge_20191023_1317.py
Normal file
15
apps/news/migrations/0025_merge_20191023_1317.py
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
# Generated by Django 2.2.4 on 2019-10-23 13:17
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('news', '0024_newsgallery_is_main'),
|
||||
('news', '0023_auto_20191023_0903'),
|
||||
('news', '0022_merge_20191015_0912'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
]
|
||||
Loading…
Reference in New Issue
Block a user