Merge branch 'master' into remove-fb-from-footer

README.md

@@ -259,5 +259,4 @@ The URL for fetching static content from the Network API can be customized by sp
 If an issue is reported by Snyk, you have several options to remedy the problem. Firstly, the build log should contain a link to the vulnerability report on snyk.io. On that page you will find links to the issue or CVE, and information about how to resolve the problem. You should start a new feature branch and pull request to resolve this issue before merging any other features.
 
 #### Unpatched vulnerabilities
-
 In some cases, vulnerabilities have not been patched - you will need to look at the nature of the issue and then add an exception to the `.snyk` file for it. You can install the snyk cli using `npm install -g snyk` and add the exception like so: `snyk ignore --id="SNYK-PYTHON-BOTO3-40617" --expiry="2017-12-31" --reason="No fix available"` (Replace the `id` and `reason` with relevant information). The `expiry` flag is an [RFC2822](https://tools.ietf.org/html/rfc2822#page-14) formatted date string that will cause the ignore rule to expire - useful so that we can check periodically for fixes to unpatched vulnerabilities in our dependencies.

network-api/networkapi/campaign/migrations/0005_auto_20180626_1435.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.13 on 2018-06-26 21:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pages', '0004_auto_20170411_0504'),
+        ('campaign', '0004_auto_20180228_2139'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='campaign',
+            name='page_ptr',
+        ),
+        migrations.RemoveField(
+            model_name='campaign',
+            name='petition',
+        ),
+        migrations.DeleteModel(
+            name='Campaign',
+        ),
+        migrations.DeleteModel(
+            name='Petition',
+        ),
+    ]