diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 16:11:49 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 16:11:49 +0200 |
| commit | 300d68ff53ee6ef9c9f09f29c6770c1bc117ea77 (patch) | |
| tree | 2f2d592da842efebf66a1666cdc9e9ef3d21e92c | |
| parent | 993167fee004ae7929da2350ad962310e26e7ae6 (diff) | |
| parent | fda2a774b7d5fe2d1f99be76f33b2e4925c20713 (diff) | |
| download | forums-300d68ff53ee6ef9c9f09f29c6770c1bc117ea77.tar forums-300d68ff53ee6ef9c9f09f29c6770c1bc117ea77.tar.gz forums-300d68ff53ee6ef9c9f09f29c6770c1bc117ea77.tar.bz2 forums-300d68ff53ee6ef9c9f09f29c6770c1bc117ea77.tar.xz forums-300d68ff53ee6ef9c9f09f29c6770c1bc117ea77.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12621] schema.json is not up to date with migration files
| -rw-r--r-- | phpBB/install/schemas/schema.json | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/install/schemas/schema.json b/phpBB/install/schemas/schema.json index 176691f1a6..f684fddc25 100644 --- a/phpBB/install/schemas/schema.json +++ b/phpBB/install/schemas/schema.json @@ -942,6 +942,10 @@ "BOOL", 0 ], + "group_skip_auth": [ + "BOOL", + 0 + ], "group_name": [ "VCHAR_CI", "" @@ -1009,12 +1013,7 @@ "group_max_recipients": [ "UINT", 0 - ], - "group_skip_auth": { - "0": "BOOL", - "1": 0, - "after": "group_founder_manage" - } + ] }, "PRIMARY_KEY": "group_id", "KEYS": { |