diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-11-16 01:23:24 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-16 01:23:24 +0100 |
| commit | 423c79e106e1977d8d1085f6cb7ac9b63be7ec63 (patch) | |
| tree | 75bc997bc880041ec4124f629c54af936ce63e7b /phpBB/docs/README.html | |
| parent | a23eebdb7bb60c4b910357c1e948b97d48071d6a (diff) | |
| parent | f5536354917d0ae9dd5a1f7c842f175478b8f904 (diff) | |
| download | forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.tar forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.tar.gz forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.tar.bz2 forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.tar.xz forums-423c79e106e1977d8d1085f6cb7ac9b63be7ec63.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (22 commits)
[ticket/11206] Remove includes to non-existent files from download/file.php
[ticket/11205] Fix merge conflict in readme.html.
[ticket/11202] Check response success before content assertions.
[ticket/11204] Reindent.
[ticket/11198] Remove additional asterix as /** is doc-block only
[ticket/11200] Add a reminder comment.
[ticket/11202] Custom message does not make sense here, delete it.
[ticket/11202] Check response success before content assertions.
[ticket/11202] Add a heuristic function to check for response success.
[ticket/11200] Make cache available during container construction
[ticket/11199] Match cache purge container files against container_*
[ticket/11199] Purge dumped container correctly on cache purge.
[ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
[ticket/11199] Cache purge does not remove dumped container
[ticket/11198] Store the swapping partners in vars and simplify the logic
[ticket/11198] Correctly set links after an item is moved up/down with AJAX
[ticket/11197] Prefix the css classes for the small arrow with "arrow"
[ticket/10879] Remove arrow icon from attachment link in editor
[ticket/11195] Condense logic, remove improperly formatted if()
[ticket/11190-develop] Functional tests purge cache before running.
...
Conflicts:
tests/test_framework/phpbb_database_test_connection_manager.php
Diffstat (limited to 'phpBB/docs/README.html')
| -rw-r--r-- | phpBB/docs/README.html | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 0e0d3b14fd..164c4a2f55 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -324,11 +324,7 @@ <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 + <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 2 and Firebird. Versions of PHP used range from 5.3.x to 5.4.x without problem.</p> <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3> |