From 65225262f6bb524b93feb49178509cada3390ee3 Mon Sep 17 00:00:00 2001
From: Kyle Francis <franck6@rpi.edu>
Date: Sat, 02 Apr 2016 18:33:17 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into compose_focus
---
SQL/postgres.initial.sql | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
index ba53112..2fc85c3 100644
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -22,6 +22,8 @@
mail_host varchar(128) DEFAULT '' NOT NULL,
created timestamp with time zone DEFAULT now() NOT NULL,
last_login timestamp with time zone DEFAULT NULL,
+ failed_login timestamp with time zone DEFAULT NULL,
+ failed_login_counter integer DEFAULT NULL,
"language" varchar(5),
preferences text DEFAULT ''::text NOT NULL,
CONSTRAINT users_username_key UNIQUE (username, mail_host)
@@ -290,4 +292,4 @@
value text
);
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2015111100');
--
Gitblit v1.9.1