diff options
author | Andreas Fischer <bantu@phpbb.com> | 2015-04-25 17:41:17 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-25 17:41:17 +0200 |
commit | 901875a1fb43610365817b61486409645787d39c (patch) | |
tree | 7fc7ae6401f9d8e17705de1b72918da8f20f4b77 /phpBB/phpbb/db | |
parent | 073f3e4470016af718f90070276305615abc007f (diff) | |
parent | 463c62df1847a3791fb7ec23b72c2f72bed12938 (diff) | |
download | forums-901875a1fb43610365817b61486409645787d39c.tar forums-901875a1fb43610365817b61486409645787d39c.tar.gz forums-901875a1fb43610365817b61486409645787d39c.tar.bz2 forums-901875a1fb43610365817b61486409645787d39c.tar.xz forums-901875a1fb43610365817b61486409645787d39c.zip |
Merge branch 'ticket/13765' into ticket/13765-3.1.4
* ticket/13765:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
Conflicts:
phpBB/includes/functions.php
phpBB/includes/startup.php
Diffstat (limited to 'phpBB/phpbb/db')
0 files changed, 0 insertions, 0 deletions