Igor Wiedler 656f18d3af Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9933] Remove empty word check.
  [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().
  [ticket/9933] Adjust word censor regex for non-unicode mode.

Conflicts:
	phpBB/includes/functions.php

Also remove static $unicode_support.

2011-01-16 20:37:39 +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

[task/acm-refactor] Remove includes/cache.php from coding guidelines

2011-01-13 12:56:54 +01:00

download

[task/config-class] Do not create multiple cache driver instances.

2011-01-12 01:47:51 +01:00

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2011-01-16 20:37:39 +01:00

install

[task/config-class] Do not create multiple cache driver instances.

2011-01-12 01:47:51 +01:00

language

[ticket/6109] MSN is now called Windows Live Messenger (WLM)

2011-01-10 01:44:54 +01:00

store

…

styles

[ticket/6109] WLM subsilver2 button in the english language package.

2011-01-10 01:45:28 +01:00

.htaccess

…

common.php

[task/config-class] Do not create multiple cache driver instances.

2011-01-12 01:47:51 +01:00

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

Merge branch 'develop-olympus' into develop

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

report.php

…

search.php

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

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

style.php

[task/config-class] Do not create multiple cache driver instances.

2011-01-12 01:47:51 +01:00

ucp.php

…

viewforum.php

Merge branch 'ticket/VSE/9532' into develop

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

viewonline.php

…

viewtopic.php

Merge branch 'ticket/VSE/9532' into develop

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

web.config

…