diff options
author | Meitar Moscovitz <meitarm@gmail.com> | 2009-02-18 13:01:52 +1100 |
---|---|---|
committer | Meitar Moscovitz <meitarm@gmail.com> | 2009-02-18 13:01:52 +1100 |
commit | cca1d777485d9b5f41bbc65ad10b002702f0aae4 (patch) | |
tree | 1a498462a0d98d4f89a55f548099abd5401dc538 /db | |
parent | 9d81cef5cc2a0a197a0223206ba3d9a687065886 (diff) | |
parent | 6fb3923cef0699a05b336f35505637485f16157e (diff) |
Merge branch 'dev-0.7.x' into framebusting
Conflicts:
lib/action.php
Diffstat (limited to 'db')
-rw-r--r-- | db/laconica.sql | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db/laconica.sql b/db/laconica.sql index 15f03a978..dd93a727b 100644 --- a/db/laconica.sql +++ b/db/laconica.sql @@ -50,6 +50,7 @@ create table user ( emailnotifyfav tinyint default 1 comment 'Notify by email of favorites', emailnotifynudge tinyint default 1 comment 'Notify by email of nudges', emailnotifymsg tinyint default 1 comment 'Notify by email of direct messages', + emailnotifyattn tinyint default 1 comment 'Notify by email of @-replies', emailmicroid tinyint default 1 comment 'whether to publish email microid', language varchar(50) comment 'preferred language', timezone varchar(50) comment 'timezone', |