php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00

Go to file

Nils Adermann c5ee92c3f2 Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().

2011-10-14 02:49:15 +02:00

build

Merge branch 'develop-olympus' into develop

2011-08-25 22:57:56 -04:00

code_sniffer/phpbb

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

git-tools

Merge remote branch 'igorw/ticket/9806' into develop-olympus

2011-03-20 22:31:14 +01:00

phpBB

Merge branch 'develop-olympus' into develop