Add latest changes after rebase

1 files changed, 20 insertions, 0 deletions

diff --git a/yaksh/migrations/0007_alter_profile_activation_key.py b/yaksh/migrations/0007_alter_profile_activation_key.py
new file mode 100644
index 0000000..bbada8c
--- /dev/null
+++ b/yaksh/migrations/0007_alter_profile_activation_key.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2017-05-16 12:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yaksh', '0006_release_0_6_0'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='activation_key',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]