Merge branch 'master' of github.com:pretix/pretix

This commit is contained in:
Raphael Michel
2015-07-30 19:33:52 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
import pretix.base.models

View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):