Merge branch 'develop' of https://github.com/ic-labs/icekit-events in…

…to develop

icekit_events/migrations/0018_auto_20170314_1401.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import colorful.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('icekit_events', '0017_eventtype_color'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eventtype',
+            name='color',
+            field=colorful.fields.RGBColorField(default=b'#cccccc', colors=[b'#00BBCC', b'#0055CC', b'#1100CC', b'#7600CC', b'#CC00BB', b'#CC0054', b'#CC1100', b'#CC7700', b'#BBCC00', b'#00CC77', b'#008C99', b'#003F99', b'#0C0099', b'#590099', b'#99008C', b'#99003F', b'#990C00', b'#995900', b'#8C9900', b'#009959']),
+        ),
+    ]

icekit_events/migrations/0021_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('icekit_events', '0018_auto_20170314_1401'),
+        ('icekit_events', '0020_auto_20170317_1341'),
+    ]
+
+    operations = [
+    ]

icekit_events/plugins/links/migrations/0002_auto_20170314_1401.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('icekit_events_links', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eventlink',
+            name='style',
+            field=models.CharField(choices=[(b'', b'Normal')], max_length=255, verbose_name=b'Link style', blank=True),
+        ),
+    ]