Igor Wiedler 3048fcf4b8 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

2011-09-05 09:14:06 +02:00

..

cache.php

Merge branch 'develop-olympus' into develop

2011-09-05 09:14:06 +02:00

lang.php

[ticket/9823] Move mock file into the mock/ folder.

2011-02-01 14:54:29 +01:00

request.php

[feature/request-class] Remove $html_encode arg, force manual decoding

2011-08-18 23:19:48 +02:00

session_testable.php

[ticket/10052] Correct session tests, and separate session factory from tests

2011-02-23 18:33:20 +01:00