Andreas Fischer 1c95101284 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9933] Create unit test for word censor regular expression.
  [ticket/9933] Move word censor regex into separate function in functions.php
  [ticket/9933] Wrong handling consecutive multiple asterisks in word censor

Conflicts:
	phpBB/includes/cache.php

2011-01-07 15:58:10 +01:00

..

info

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

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

acp_attachments.php

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

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

acp_ban.php

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

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

acp_bbcodes.php

[ticket/9574] Add pcre_utf8_support() function

2010-12-28 22:37:33 +01:00

acp_board.php

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

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

acp_bots.php

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

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

acp_captcha.php

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

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

acp_database.php

[ticket/9574] Remove conditional PHP<5.2 code

2010-12-28 22:36:25 +01:00

acp_disallow.php

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

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

acp_email.php

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

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

acp_forums.php

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

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

acp_groups.php

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

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

acp_icons.php

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

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

acp_inactive.php

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

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

acp_jabber.php

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

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

acp_language.php

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

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

acp_logs.php

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

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

acp_main.php

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

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

acp_modules.php

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

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

acp_permission_roles.php

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

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

acp_permissions.php

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

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

acp_php_info.php

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

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

acp_profile.php

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

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

acp_prune.php

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

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

acp_ranks.php

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

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

acp_reasons.php

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

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

acp_search.php

Merge branch 'feature/igorw/request-class' into develop

2010-12-16 02:22:17 +01:00

acp_send_statistics.php

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

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

acp_styles.php

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

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

acp_update.php

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

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

acp_users.php

[ticket/9746] Adding some more calls to phpbb_ip_normalise().

2011-01-03 00:09:52 +01:00

acp_words.php

Merge branch 'develop-olympus' into develop

2011-01-07 15:58:10 +01:00

auth.php

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

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