diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-24 20:59:11 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-24 20:59:11 +0200 |
| commit | b5b0175d59ce32e5bd16d71d3ab1aec8435388ea (patch) | |
| tree | 768b5cb3ae9ad6a69e76aac7d87492fecb8fc70b /phpBB/develop | |
| parent | 1edcfcb5020f8199860295020e5e33d030ab772b (diff) | |
| parent | 2596dbc850df86dd0d620e9d90bfd59a2f23a0eb (diff) | |
| download | forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.tar forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.tar.gz forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.tar.bz2 forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.tar.xz forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12755] Apply de morgan to conditional
[ticket/12755] Terminate upload loop if upload reaches filesize
[ticket/12755] Change upload in remote_upload() method to fit get_remote_file
[ticket/12755] Add language string for timed out remote upload
[ticket/12755] Add timeout to remote upload to prevent infinite loop
Diffstat (limited to 'phpBB/develop')
0 files changed, 0 insertions, 0 deletions