diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:58:27 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:58:27 +0100 |
| commit | e2046444a17473eefe68a67d26a34cd25e3872b5 (patch) | |
| tree | 7094a4c02545c8e9594c1f42d7a5fe8fe95aae92 /phpBB/includes/php | |
| parent | d2a15d9afe06509ff3e9fe5b6463800f66813783 (diff) | |
| parent | 639110766caf40235768d8eed992745a9ab294b0 (diff) | |
| download | forums-e2046444a17473eefe68a67d26a34cd25e3872b5.tar forums-e2046444a17473eefe68a67d26a34cd25e3872b5.tar.gz forums-e2046444a17473eefe68a67d26a34cd25e3872b5.tar.bz2 forums-e2046444a17473eefe68a67d26a34cd25e3872b5.tar.xz forums-e2046444a17473eefe68a67d26a34cd25e3872b5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11361] Make sure that array passed to strtr() has the proper format.
Conflicts:
phpBB/includes/session.php
Diffstat (limited to 'phpBB/includes/php')
0 files changed, 0 insertions, 0 deletions