diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-29 00:09:12 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-29 00:09:12 +0100 |
| commit | 5b96d305405d6942c4c04f5fbc83c8118c44a3e9 (patch) | |
| tree | c13377bd60355af710edde5342a434a0a4abea6f /phpBB/includes/diff/diff.php | |
| parent | ef10b02f78cc74a7740c44ccc116f123a1883be0 (diff) | |
| parent | 6f5524de26ae9df2c15a3f8218770dad0c72e3af (diff) | |
| download | forums-5b96d305405d6942c4c04f5fbc83c8118c44a3e9.tar forums-5b96d305405d6942c4c04f5fbc83c8118c44a3e9.tar.gz forums-5b96d305405d6942c4c04f5fbc83c8118c44a3e9.tar.bz2 forums-5b96d305405d6942c4c04f5fbc83c8118c44a3e9.tar.xz forums-5b96d305405d6942c4c04f5fbc83c8118c44a3e9.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
Conflicts:
phpBB/includes/startup.php
tests/security/trailing_path_test.php
Diffstat (limited to 'phpBB/includes/diff/diff.php')
0 files changed, 0 insertions, 0 deletions