diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-10 06:09:59 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-10 06:25:51 -0500 |
| commit | eaa0319867783868a761c9ede5398d52351c38d5 (patch) | |
| tree | a4adb4751b9699da20b87313d37c59a5c342d7be /phpBB/includes/diff/diff.php | |
| parent | 3fe381eed561e724700b21789e28ea3efb1f7ef9 (diff) | |
| parent | 3c542b852a99f62337c8cf1c6d3e6551c4e3dca1 (diff) | |
| download | forums-eaa0319867783868a761c9ede5398d52351c38d5.tar forums-eaa0319867783868a761c9ede5398d52351c38d5.tar.gz forums-eaa0319867783868a761c9ede5398d52351c38d5.tar.bz2 forums-eaa0319867783868a761c9ede5398d52351c38d5.tar.xz forums-eaa0319867783868a761c9ede5398d52351c38d5.zip | |
Merge PR #1125 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10972] Drop user deletion.
[ticket/10972] Tweak user addition.
[ticket/10972] Add destroy method to mock cache.
[ticket/10972] Add mock null cache.
[ticket/10972] Backport get_db from develop.
[ticket/10972] Added explicit checks for creating duplicate users.
[ticket/10972] Moved tests into appropriate places and added comments
[ticket/10972] Added methods for creating and deleting basic users
Conflicts:
tests/mock/cache.php
tests/test_framework/phpbb_functional_test_case.php
Diffstat (limited to 'phpBB/includes/diff/diff.php')
0 files changed, 0 insertions, 0 deletions