diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-01-23 18:44:03 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-01-23 18:44:03 +0100 |
| commit | 10169d1c3e6c68f596bb03acb3b6389eb6056804 (patch) | |
| tree | fe17008b34a4d7a517c5397d36e4829fb471a88a /phpBB/includes/diff/engine.php | |
| parent | 1196b96462e519271d01bc1821aafc35aafc0fd8 (diff) | |
| parent | e1e84f9bd080bb6cad604611535dc38e4109eb47 (diff) | |
| download | forums-10169d1c3e6c68f596bb03acb3b6389eb6056804.tar forums-10169d1c3e6c68f596bb03acb3b6389eb6056804.tar.gz forums-10169d1c3e6c68f596bb03acb3b6389eb6056804.tar.bz2 forums-10169d1c3e6c68f596bb03acb3b6389eb6056804.tar.xz forums-10169d1c3e6c68f596bb03acb3b6389eb6056804.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[task/session-tests] Renamed assertSqlResultEquals and fixed its param order
[task/session-tests] Test additional combinations of session_begin.
[task/session-tests] Added tests for the session class.
Conflicts:
tests/mock/cache.php
Diffstat (limited to 'phpBB/includes/diff/engine.php')
0 files changed, 0 insertions, 0 deletions