Files
web2.0-backend/webapp/migrations/0042_merge_20180516_2249.py
Aarni Halinen d7a3433d2c Merge branch 'feature-contacts' into develop
Conflicts:
	webapp/admin.py
	webapp/models.py
	webapp/views.py
2018-05-16 22:49:38 +03:00

17 lines
339 B
Python

# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2018-05-16 19:49
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('webapp', '0041_auto_20180516_2204'),
('webapp', '0041_delete_ohlhafvchallenge'),
]
operations = [
]