diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-04-24 19:13:47 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-04-24 19:13:47 +0200 |
| commit | b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd (patch) | |
| tree | ed007c3506c30382f2fafe511c755138679ab15f /phpBB/includes/controller/exception.php | |
| parent | aaf109e07d6847fd45c6c3ce0a72399aa21ff5cb (diff) | |
| parent | a33cc92fc8890ccb5910c32d09a66420e7f71215 (diff) | |
| download | forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.tar forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.tar.gz forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.tar.bz2 forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.tar.xz forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9975] Translate missing style error message
Conflicts:
phpBB/includes/session.php
Diffstat (limited to 'phpBB/includes/controller/exception.php')
0 files changed, 0 insertions, 0 deletions