diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-19 21:43:23 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-19 21:43:23 -0400 |
| commit | 248559d7d10e0d347e139469b5e5a9774e65c11e (patch) | |
| tree | 2c36c846000dfbfcf697a7f3da659ca3069e2c0c /phpBB/install | |
| parent | 7fc4a184c27e3977ef80da17729d9c510b74d43f (diff) | |
| parent | 8bb083eed91f049600ff0db4d8528e7a6c7e5093 (diff) | |
| download | forums-248559d7d10e0d347e139469b5e5a9774e65c11e.tar forums-248559d7d10e0d347e139469b5e5a9774e65c11e.tar.gz forums-248559d7d10e0d347e139469b5e5a9774e65c11e.tar.bz2 forums-248559d7d10e0d347e139469b5e5a9774e65c11e.tar.xz forums-248559d7d10e0d347e139469b5e5a9774e65c11e.zip | |
Merge PR #734 branch 'shibulijack/ticket/10688' into develop
* shibulijack/ticket/10688:
[ticket/10688] Update install.html for 3.1 and current practices.
[ticket/10688] Update readme for 3.1 and current practices.
[ticket/10688] Changed version 3.0 to 3.1
[ticket/10688] Updated version to 3.1
[ticket/10688] Changed 3.0 to 3.1 in docs
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index aea6074637..0b6daeef47 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -13,7 +13,7 @@ if (!defined('IN_PHPBB')) } /** -* Helper functions for phpBB 2.0.x to phpBB 3.0.x conversion +* Helper functions for phpBB 2.0.x to phpBB 3.1.x conversion */ /** |