Nils Adermann 527f02bb4b Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php

Conflicts:
	tests/bbcode/url_bbcode_test.php

2012-07-08 23:10:42 +02:00

..

cache.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

extension_manager.php

[ticket/9916] Updating license in non-distributed files

2012-01-02 19:10:36 +01:00

lang.php

[ticket/9916] Updating license in non-distributed files

2012-01-02 19:10:36 +01:00

request.php

[ticket/9916] Updating license in non-distributed files

2012-01-02 19:10:36 +01:00

session_testable.php

[feature/class-prefix] Rename user and session to phpbb_*

2012-03-31 18:14:07 +02:00

user.php

[ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php

2012-07-08 22:46:14 +02:00