From 5c6a3d884564aad6b4dce25c9f1d30465774c07a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 24 Oct 2012 09:48:22 +0200 Subject: [PATCH] [feature/soft-delete] Revert doc fix from b8c55291 It should be fixed separately PHPBB3-9567 --- phpBB/docs/README.html | 4 ++++ 1 file changed, 4 insertions(+) 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 @@

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.

+<<<<<<< HEAD

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.

+======= +

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.

+>>>>>>> develop-olympus

7.i. Notice on PHP security issues