diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-19 15:44:25 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-19 15:44:25 +0200 |
| commit | f49be858598f10abfb9c7886bd698cdec862fe1c (patch) | |
| tree | 74ec809adab6e537785aba5eb51e407d71e0c344 /phpBB/includes/cache/driver/wincache.php | |
| parent | a70eedecdecd4d0e0955a1ba1ba71879e9b3bd57 (diff) | |
| parent | 4fc180ade5098d8efca44327795118c018ef255c (diff) | |
| download | forums-f49be858598f10abfb9c7886bd698cdec862fe1c.tar forums-f49be858598f10abfb9c7886bd698cdec862fe1c.tar.gz forums-f49be858598f10abfb9c7886bd698cdec862fe1c.tar.bz2 forums-f49be858598f10abfb9c7886bd698cdec862fe1c.tar.xz forums-f49be858598f10abfb9c7886bd698cdec862fe1c.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11537] Adjust error message on ucp group manage to fit rest of ucp
Conflicts:
phpBB/styles/prosilver/template/ucp_groups_manage.html
Diffstat (limited to 'phpBB/includes/cache/driver/wincache.php')
0 files changed, 0 insertions, 0 deletions