Merge branch 'develop-olympus' into develop

Browse Source

This commit also ports all ascraeus tests to the new format.

Conflicts:
	tests/all_tests.php
	tests/network/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/template/templates/includephp.html

...

This commit is contained in:

Igor Wiedler

2011-01-07 01:39:18 +01:00

parent da4617b14b 5b752a2fed

commit 14a84cf89c

47 changed files with 128 additions and 678 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

phpBB/docs/nginx.conf.sample → phpBB/docs/nginx.sample.conf