Merge migrations and fix spacing
This commit is contained in:
parent
4ab8963149
commit
c2a76e6c39
2 changed files with 19 additions and 2 deletions
16
hosting/migrations/0037_merge.py
Normal file
16
hosting/migrations/0037_merge.py
Normal file
|
@ -0,0 +1,16 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.4 on 2017-05-07 04:49
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('hosting', '0031_hostingbill_total_price'),
|
||||
('hosting', '0036_auto_20170506_2312'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
]
|
|
@ -4,6 +4,7 @@ import oca
|
|||
from django.db import models
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.functional import cached_property
|
||||
from django.conf import settings
|
||||
|
||||
from Crypto.PublicKey import RSA
|
||||
from stored_messages.settings import stored_messages_settings
|
||||
|
|
Loading…
Reference in a new issue