Merge remote branch 'origin/sweden-rebase'

Conflicts:
	bin/update-schema
	locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
	perllib/FixMyStreet/DB/Result/Body.pm

2 files changed, 10 insertions, 0 deletions

diff --git a/db/schema.sql b/db/schema.sql
index 125e680c6..6ddb7bae6 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -55,6 +55,7 @@ create table users (
 create table body (
     id           serial primary key,
     name         text not null,
+    external_url text,
     parent       integer references body(id),
     endpoint     text,
     jurisdiction text,
diff --git a/db/schema_0031-add_url_to_body.sql b/db/schema_0031-add_url_to_body.sql
new file mode 100644
index 000000000..7aaa78c64
--- /dev/null
+++ b/db/schema_0031-add_url_to_body.sql
@@ -0,0 +1,9 @@
+BEGIN;
+
+-- `external_url' includes an URL for reporting problems to the body directly.
+-- It can be displayed in the new report form when no contacts are set; see
+-- templates/web/fixamingata/report/new/councils_text_none.html for an example.
+
+ALTER TABLE body ADD external_url TEXT;
+
+COMMIT;