Merge branch 'master' into stable

2 files changed, 36 insertions, 0 deletions

diff --git a/program/migrations/0006_note_remove_cba_entry_id.py b/program/migrations/0006_note_remove_cba_entry_id.py
new file mode 100644
index 0000000..d04be57
--- /dev/null
+++ b/program/migrations/0006_note_remove_cba_entry_id.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('program', '0005_programslot_is_active'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='note',
+            name='cba_entry_id',
+        ),
+    ]
diff --git a/program/migrations/0007_show_remove_cba_series_id.py b/program/migrations/0007_show_remove_cba_series_id.py
new file mode 100644
index 0000000..1173b51
--- /dev/null
+++ b/program/migrations/0007_show_remove_cba_series_id.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('program', '0006_note_remove_cba_entry_id'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='show',
+            name='cba_series_id',
+        ),
+    ]