Fix merge with upstream

2018-05-27 07:09:02 +02:00
parent 1d0168379a 71f9587374
commit 83d6f9547e
121 changed files with 2598 additions and 407 deletions
--- a/tests/_data/schema.sql
+++ b/tests/_data/schema.sql
@ -76,6 +76,8 @@ CREATE TABLE `user` (
  `gdpr_consent` tinyint(1) NULL DEFAULT '0',
 	`gdpr_consent_date` int(11) NULL,
 	`gdpr_deleted` tinyint(1) DEFAULT '0',
+  `last_login_ip` varchar(45) DEFAULT NULL,
+  `password_changed_at` int(11) DEFAULT NULL,

  PRIMARY KEY (`id`),
  UNIQUE KEY `user_unique_email` (`email`),