Merge branch 'zurich-mark-external-addresses-deleted'

Conflicts:
	t/cobrand/zurich.t

1 files changed, 1 insertions, 0 deletions

diff --git a/bin/update-schema b/bin/update-schema
index f728f8c56..81c9ff4ab 100644
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -84,6 +84,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 '0029' if column_exists('body', 'deleted');
     return '0028' if table_exists('body');
     return '0027' if column_exists('problem', 'subcategory');
     return '0026' if column_exists('open311conf', 'send_extended_statuses');