diff options
| author | Yaroslav <contact@yaroslavps.com> | 2019-01-10 21:11:59 +0300 |
|---|---|---|
| committer | Yaroslav <contact@yaroslavps.com> | 2019-01-10 21:11:59 +0300 |
| commit | 5c677b866d8fa915384a1f4ccc4af327a5205685 (patch) | |
| tree | e5bec1705b6392438c2635c8aa91a1879c452d9e /weblog/migrations | |
| parent | 7d9891f11a8b9a354eafeabdaf691a7693db3840 (diff) | |
| parent | 468d6c86a076623e5ea7c38cd8b2547e6f9f1529 (diff) | |
| download | w3blog-5c677b866d8fa915384a1f4ccc4af327a5205685.tar.gz w3blog-5c677b866d8fa915384a1f4ccc4af327a5205685.zip | |
Merge branch 'tiberiuichim-master' into testing
Merging into testing instead of master to make some changes before
bundling it into a patch.
Diffstat (limited to 'weblog/migrations')
| -rw-r--r-- | weblog/migrations/0009_merge_20190104_2123.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/weblog/migrations/0009_merge_20190104_2123.py b/weblog/migrations/0009_merge_20190104_2123.py new file mode 100644 index 0000000..5c8ba71 --- /dev/null +++ b/weblog/migrations/0009_merge_20190104_2123.py @@ -0,0 +1,14 @@ +# Generated by Django 2.1.3 on 2019-01-04 19:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('weblog', '0008_auto_20180329_1316'), + ('weblog', '0008_auto_20180531_0329'), + ] + + operations = [ + ] |