diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-11 19:26:37 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-08-11 19:26:37 +0200 |
| commit | a60d4b250798bfd8e974746dcb3d6b5a81f063ed (patch) | |
| tree | f7230424976f51cd38eb83dd244faf5be70a4c8c | |
| parent | 24dc0a66ebcf299c4165c4e42c5ec9cf9faa75f7 (diff) | |
| parent | f76d671dc780f18ca329ef8c21f674cc40336e4a (diff) | |
| download | forums-a60d4b250798bfd8e974746dcb3d6b5a81f063ed.tar forums-a60d4b250798bfd8e974746dcb3d6b5a81f063ed.tar.gz forums-a60d4b250798bfd8e974746dcb3d6b5a81f063ed.tar.bz2 forums-a60d4b250798bfd8e974746dcb3d6b5a81f063ed.tar.xz forums-a60d4b250798bfd8e974746dcb3d6b5a81f063ed.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12970] Regenerate schema.json with new dependencies
| -rw-r--r-- | phpBB/install/schemas/schema.json | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/phpBB/install/schemas/schema.json b/phpBB/install/schemas/schema.json index 4e014c77ed..b71b1fecbe 100644 --- a/phpBB/install/schemas/schema.json +++ b/phpBB/install/schemas/schema.json @@ -2088,16 +2088,12 @@ "UINT", 0 ], - "pf_phpbb_skype": [ - "VCHAR", - "" - ], - "pf_phpbb_twitter": [ - "VCHAR", + "pf_phpbb_interests": [ + "MTEXT", "" ], - "pf_phpbb_youtube": [ - "VCHAR", + "pf_phpbb_occupation": [ + "MTEXT", "" ], "pf_phpbb_facebook": [ @@ -2108,19 +2104,19 @@ "VCHAR", "" ], - "pf_phpbb_interests": [ - "MTEXT", + "pf_phpbb_icq": [ + "VCHAR", "" ], - "pf_phpbb_occupation": [ - "MTEXT", + "pf_phpbb_location": [ + "VCHAR", "" ], - "pf_phpbb_icq": [ + "pf_phpbb_skype": [ "VCHAR", "" ], - "pf_phpbb_location": [ + "pf_phpbb_twitter": [ "VCHAR", "" ], @@ -2136,6 +2132,10 @@ "VCHAR", "" ], + "pf_phpbb_youtube": [ + "VCHAR", + "" + ], "pf_phpbb_aol": [ "VCHAR", "" |