diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 18:07:29 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 18:07:29 +0100 |
| commit | b964d175645041d6d88e8fc36c99d58abfbfd97e (patch) | |
| tree | 71a93d155427adccc7d971a4b7e1ce264a395331 /phpBB/includes/cache/driver/memory.php | |
| parent | e2046444a17473eefe68a67d26a34cd25e3872b5 (diff) | |
| parent | 65118218c75d92beaee299985bdf003cb62628e9 (diff) | |
| download | forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.tar forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.tar.gz forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.tar.bz2 forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.tar.xz forums-b964d175645041d6d88e8fc36c99d58abfbfd97e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11355] Referred proper variable when validating selection.
[ticket/11355] Wrong error message when no user is selected.
Conflicts:
phpBB/includes/acp/acp_groups.php
Diffstat (limited to 'phpBB/includes/cache/driver/memory.php')
0 files changed, 0 insertions, 0 deletions