diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-01-07 15:58:10 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-07 15:58:10 +0100 |
| commit | 1c95101284d1545443bf6070d2f9dbc2880165f6 (patch) | |
| tree | fe969e58749941a6754ecc882223a7c3b921e026 /phpBB/includes/acp/info/acp_board.php | |
| parent | 08f6a12325ab02696e0093ff7ddfb005dd7d2321 (diff) | |
| parent | a469e804930e66c244da27deb4dc94b5e280659f (diff) | |
| download | forums-1c95101284d1545443bf6070d2f9dbc2880165f6.tar forums-1c95101284d1545443bf6070d2f9dbc2880165f6.tar.gz forums-1c95101284d1545443bf6070d2f9dbc2880165f6.tar.bz2 forums-1c95101284d1545443bf6070d2f9dbc2880165f6.tar.xz forums-1c95101284d1545443bf6070d2f9dbc2880165f6.zip | |
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
Diffstat (limited to 'phpBB/includes/acp/info/acp_board.php')
0 files changed, 0 insertions, 0 deletions