From: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Date: Thu, 1 Nov 2018 16:33:50 +0000 (+0100)
Subject: Merge branch 'addressbook-uid-check-migration' of https://github.com/nextcloud/server... 
X-Git-Tag: v15.0.0beta1~54^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=98f30c2dab24f0ab80015ef7849a7d8875651f6f;p=nextcloud-server.git

Merge branch 'addressbook-uid-check-migration' of https://github.com/nextcloud/server into addressbook-uid-check-migration

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---

98f30c2dab24f0ab80015ef7849a7d8875651f6f
diff --cc tests/lib/Repair/SetVcardDatabaseUIDTest.php
index fe1a7481d7b,59a115ba755..97da3c6a901
--- a/tests/lib/Repair/SetVcardDatabaseUIDTest.php
+++ b/tests/lib/Repair/SetVcardDatabaseUIDTest.php
@@@ -118,4 -118,4 +118,4 @@@ class SetVcardDatabaseUIDTest extends T
  		$this->assertEquals($expected, $this->invokePrivate($this->repair, 'shouldRun'));
  	}
  
--}
++}