diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-09-05 09:14:06 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-09-05 09:14:06 +0200 |
| commit | 3048fcf4b811d471b26acdc790bdac18b8e9500e (patch) | |
| tree | 3ae214da08be5f76b5ac827fa15a1b569a57bb34 /phpBB/faq.php | |
| parent | 6f9df6199cee4a845a1cc654ebb92cfc67328ec7 (diff) | |
| parent | 85bdc65df1ffa31a395623941e363d397f6688ac (diff) | |
| download | forums-3048fcf4b811d471b26acdc790bdac18b8e9500e.tar forums-3048fcf4b811d471b26acdc790bdac18b8e9500e.tar.gz forums-3048fcf4b811d471b26acdc790bdac18b8e9500e.tar.bz2 forums-3048fcf4b811d471b26acdc790bdac18b8e9500e.tar.xz forums-3048fcf4b811d471b26acdc790bdac18b8e9500e.zip | |
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
Diffstat (limited to 'phpBB/faq.php')
0 files changed, 0 insertions, 0 deletions