From a4fa34cecbd038fb2cc323aefd2b32739aaee7d5 Mon Sep 17 00:00:00 2001 From: mikec Date: Mon, 21 Jul 2008 09:56:37 -0400 Subject: Resolve conflicts after pull from evan darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz --- db/laconica.sql | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'db') diff --git a/db/laconica.sql b/db/laconica.sql index 79c34e712..ae5184778 100644 --- a/db/laconica.sql +++ b/db/laconica.sql @@ -47,6 +47,10 @@ create table user ( email varchar(255) unique key comment 'email address for password recovery etc.', incomingemail varchar(255) unique key comment 'email address for post-by-email', emailnotifysub tinyint default 1 comment 'Notify by email of subscriptions', + emailmicroid tinyint default 1 comment 'whether to publish email microid', + language varchar(50) comment 'preferred language', + timezone varchar(50) comment 'timezone', + emailpost tinyint default 1 comment 'Post by email', jabber varchar(255) unique key comment 'jabber ID for notices', jabbernotify tinyint default 0 comment 'whether to send notices to jabber', jabberreplies tinyint default 0 comment 'whether to send notices to jabber on replies', -- cgit v1.2.3-54-g00ecf