diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:48:29 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:48:29 -0600 |
| commit | c1840c78c5ea2967dfc1912665ec19ebc25c22c6 (patch) | |
| tree | cd609ca105e042f3f1a91ece20acb293b30d2eef /phpBB/includes/constants.php | |
| parent | 071defded6f0e4d2a805b336f56f0a2524d5b1b6 (diff) | |
| parent | eb5075c80f9ddbec220e613a92ba37aa03a8a4f9 (diff) | |
| download | forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.tar forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.tar.gz forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.tar.bz2 forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.tar.xz forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3
Conflicts:
phpBB/includes/db/migrator.php
Diffstat (limited to 'phpBB/includes/constants.php')
| -rw-r--r-- | phpBB/includes/constants.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 36576e5344..8c27d3fd0c 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -270,6 +270,7 @@ define('STYLES_TEMPLATE_DATA_TABLE',$table_prefix . 'styles_template_data'); define('STYLES_THEME_TABLE', $table_prefix . 'styles_theme'); define('STYLES_IMAGESET_TABLE', $table_prefix . 'styles_imageset'); define('STYLES_IMAGESET_DATA_TABLE',$table_prefix . 'styles_imageset_data'); +define('TEAMPAGE_TABLE', $table_prefix . 'teampage'); define('TOPICS_TABLE', $table_prefix . 'topics'); define('TOPICS_POSTED_TABLE', $table_prefix . 'topics_posted'); define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_track'); |