php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-09-14 10:02:07 +02:00

Go to file

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

* develop-olympus:
  [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR.
  [ticket/9802] Only check for IPv4-mapped address when address is IPv6.
  [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.
  [ticket/9802] Remove redundant character class definition from preg_replace.
  [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.

Conflicts:
	phpBB/includes/session.php

2011-06-10 00:53:38 +02:00

build

Merge branch 'develop-olympus' into develop

2011-06-09 12:45:11 +02: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