diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 19:52:58 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 19:52:58 -0400 |
| commit | 00a69b43723b89a90bc59763a1cdae9a7001a153 (patch) | |
| tree | 8b4c09e4392c091164dceaaa0a7800f496653a92 /phpBB/includes/cache/driver/base.php | |
| parent | 2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28 (diff) | |
| parent | bdb84452f55bb1f71fc7ddfd913715dcde5703eb (diff) | |
| download | forums-00a69b43723b89a90bc59763a1cdae9a7001a153.tar forums-00a69b43723b89a90bc59763a1cdae9a7001a153.tar.gz forums-00a69b43723b89a90bc59763a1cdae9a7001a153.tar.bz2 forums-00a69b43723b89a90bc59763a1cdae9a7001a153.tar.xz forums-00a69b43723b89a90bc59763a1cdae9a7001a153.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
[ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
Diffstat (limited to 'phpBB/includes/cache/driver/base.php')
0 files changed, 0 insertions, 0 deletions