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

1 files changed, 1 insertions, 0 deletions

diff --git a/bin/update-schema b/bin/update-schema
index ef33b82a7..be5bc50e7 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -85,6 +85,7 @@ print "Nothing to do\n" if $nothing;
 # By querying the database schema, we can see where we're currently at
 # (assuming schema change files are never half-applied, which should be the case)
 sub get_db_version {
+    return '0031' if column_exists('body', 'external_url');
     return '0030' if ! constraint_exists('admin_log_action_check');
     return '0029' if column_exists('body', 'deleted');
     return '0028' if table_exists('body');