diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-10-24 09:48:22 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-10-24 09:48:22 +0200 |
| commit | 5c6a3d884564aad6b4dce25c9f1d30465774c07a (patch) | |
| tree | 0117c25f4d3b599a040ecec9f760ce795e0f552b | |
| parent | b2b5dbed26762d8c434f50ef2d7972c77b593cb3 (diff) | |
| download | forums-5c6a3d884564aad6b4dce25c9f1d30465774c07a.tar forums-5c6a3d884564aad6b4dce25c9f1d30465774c07a.tar.gz forums-5c6a3d884564aad6b4dce25c9f1d30465774c07a.tar.bz2 forums-5c6a3d884564aad6b4dce25c9f1d30465774c07a.tar.xz forums-5c6a3d884564aad6b4dce25c9f1d30465774c07a.zip | |
[feature/soft-delete] Revert doc fix from b8c55291
It should be fixed separately
PHPBB3-9567
| -rw-r--r-- | phpBB/docs/README.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 9bd6f13bf4..8f9e960275 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -324,7 +324,11 @@ <p>Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.</p> +<<<<<<< HEAD <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 5.3.x to 5.4.x without problem.</p> +======= + <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem. </p> +>>>>>>> develop-olympus <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3> |