php-phpbb

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

Go to file

Nils Adermann 10169d1c3e Merge branch 'develop-olympus' into develop

* develop-olympus:
  [task/session-tests] Renamed assertSqlResultEquals and fixed its param order
  [task/session-tests] Test additional combinations of session_begin.
  [task/session-tests] Added tests for the session class.

Conflicts:
	tests/mock/cache.php

2011-01-23 18:44:03 +01:00

build

Merge branch 'develop-olympus' into develop

2011-01-07 14:22:29 +01:00

code_sniffer/phpbb

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

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

git-tools/hooks

Merge branch 'task/cs278/git-tools' into develop-olympus

2010-09-09 00:20:38 +02:00

phpBB

Merge branch 'develop-olympus' into develop