Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Sarven Capadisli 2009-11-18 09:24:01 +00:00
commit 229958e220

View File

@ -571,7 +571,7 @@ create table user_role (
); );
create table login_token ( create table login_token (
user_id integer not null /* comment 'user owning this token'*/ references user (id), user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
token char(32) not null /* comment 'token useable for logging in'*/, token char(32) not null /* comment 'token useable for logging in'*/,
created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/, created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
modified timestamp /* comment 'date this record was modified'*/, modified timestamp /* comment 'date this record was modified'*/,