Merge iCal migrations

aleksis/core/migrations/0039_personal_ical_url.py

@@ -28,4 +28,14 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'Personal Calendar URLs',
             },
         ),
+        migrations.AlterModelOptions(
+            name='globalpermissions',
+            options={'default_permissions': (), 'managed': False, 'permissions': (
+            ('view_system_status', 'Can view system status'), ('manage_data', 'Can manage data'),
+            ('impersonate', 'Can impersonate'), ('search', 'Can use search'),
+            ('change_site_preferences', 'Can change site preferences'),
+            ('change_person_preferences', 'Can change person preferences'),
+            ('change_group_preferences', 'Can change group preferences'), ('test_pdf', 'Can test PDF generation'),
+            ('invite', 'Can invite persons'), ('use_ical', 'Can create and consume iCal feeds'))},
+        ),
     ]