mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-20 07:21:30 +02:00
Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
This commit is contained in:
@@ -1526,8 +1526,7 @@ CREATE TABLE [phpbb_users] (
|
||||
[user_inactive_time] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_posts] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_lang] [varchar] (30) DEFAULT ('') NOT NULL ,
|
||||
[user_timezone] [float] DEFAULT (0) NOT NULL ,
|
||||
[user_dst] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_timezone] [varchar] (100) DEFAULT ('UTC') NOT NULL ,
|
||||
[user_dateformat] [varchar] (30) DEFAULT ('d M Y H:i') NOT NULL ,
|
||||
[user_style] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_rank] [int] DEFAULT (0) NOT NULL ,
|
||||
|
Reference in New Issue
Block a user