Merge branch '1146-social-login'

Conflicts:
	templates/web/base/report/new/fill_in_details_form.html
	templates/web/base/report/update-form.html

1 files changed, 1 insertions, 0 deletions

diff --git a/bin/update-schema b/bin/update-schema
index c6b197deb..1393178f8 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -194,6 +194,7 @@ else {
 # 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 '0039' if column_exists('users', 'facebook_id');
     return '0038' if column_exists('admin_log', 'time_spent');
     return '0037' if table_exists('response_templates');
     return '0036' if constraint_contains('problem_cobrand_check', 'a-z0-9_');