diff options
author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 18:14:39 -0500 |
---|---|---|
committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 18:14:39 -0500 |
commit | 0b0b5e15c3b7fc55774df09025f6bb206f7df4bd (patch) | |
tree | 6acfa3ec8942176337c4859e7dcf986d2e0fbc62 /phpBB/includes/functions_upload.php | |
parent | 8b4e6619049e5bb36bd28af218f9b60834b10b99 (diff) | |
parent | 4001410c8c80ac9c531343af28310e97b4bbf1fe (diff) | |
download | forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.tar forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.tar.gz forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.tar.bz2 forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.tar.xz forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.zip |
Merge PR #1191 branch 'bantu/ticket/11324' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11324:
[ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
Diffstat (limited to 'phpBB/includes/functions_upload.php')
0 files changed, 0 insertions, 0 deletions