Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12970] Regenerate schema.json with new dependencies
This commit is contained in:
Tristan Darricau 2014-08-11 19:26:37 +02:00
commit a60d4b2507

View file

@ -2088,16 +2088,12 @@
"UINT",
0
],
"pf_phpbb_skype": [
"VCHAR",
"pf_phpbb_interests": [
"MTEXT",
""
],
"pf_phpbb_twitter": [
"VCHAR",
""
],
"pf_phpbb_youtube": [
"VCHAR",
"pf_phpbb_occupation": [
"MTEXT",
""
],
"pf_phpbb_facebook": [
@ -2108,14 +2104,6 @@
"VCHAR",
""
],
"pf_phpbb_interests": [
"MTEXT",
""
],
"pf_phpbb_occupation": [
"MTEXT",
""
],
"pf_phpbb_icq": [
"VCHAR",
""
@ -2124,6 +2112,14 @@
"VCHAR",
""
],
"pf_phpbb_skype": [
"VCHAR",
""
],
"pf_phpbb_twitter": [
"VCHAR",
""
],
"pf_phpbb_website": [
"VCHAR",
""
@ -2136,6 +2132,10 @@
"VCHAR",
""
],
"pf_phpbb_youtube": [
"VCHAR",
""
],
"pf_phpbb_aol": [
"VCHAR",
""