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

..

adm

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

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

cache

…

develop

Merge branch 'ticket/igorw/9556' into develop

2010-12-13 16:35:55 +01:00

docs

Merge branch 'develop-olympus' into develop

2011-01-07 01:39:59 +01:00

download

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

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

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

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

install

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

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

language

Merge branch 'develop-olympus' into develop

2010-12-29 23:01:19 +01:00

store

…

styles

Merge branch 'develop-olympus' into develop

2010-12-29 23:01:19 +01:00

.htaccess

…

common.php

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

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

cron.php

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

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

faq.php

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

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

feed.php

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

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

index.php

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

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

mcp.php

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

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

memberlist.php

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

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

posting.php

Merge branch 'develop-olympus' into develop

2010-12-13 17:14:36 +01:00

report.php

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

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

search.php

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

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

style.php

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

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

ucp.php

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

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

viewforum.php

Merge branch 'ticket/VSE/9532' into develop

2010-12-28 21:51:55 +01:00

viewonline.php

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

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

viewtopic.php

Merge branch 'ticket/VSE/9532' into develop

2010-12-28 21:51:55 +01:00

web.config

…