php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 10:31:57 +02:00

Go to file

Igor Wiedler 3048fcf4b8 Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10240] Added optionset to mock_user in the tests.
  [ticket/10240] Fixed copyright year in censor_text_test.php.
  [ticket/10240] Fixed censor_text test assetEquals param order.
  [ticket/10240] Added censor_text tests for special characters.
  [ticket/10240] Added censor_text tests.

Conflicts:
	tests/mock/cache.php

2011-09-05 09:14:06 +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 remote-tracking branch 'bantu/ticket/9474' into develop