diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-26 11:33:17 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-26 11:33:17 +0100 |
| commit | c49e7387d69b23e07c4ba9f35ffebce78a2cb09c (patch) | |
| tree | f8646742a788d342b31335288395921c3f53ac2d /phpBB/phpbb/template/context.php | |
| parent | 0d0b2627f723c3003af0ea301511a972008e7734 (diff) | |
| parent | afb4585dd904de6f5ce4be2607cc90d0cb9def09 (diff) | |
| download | forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.tar forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.tar.gz forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.tar.bz2 forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.tar.xz forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12037] Fix hard-coded text in acp_inactive.html.
Conflicts:
phpBB/adm/style/acp_inactive.html
Diffstat (limited to 'phpBB/phpbb/template/context.php')
0 files changed, 0 insertions, 0 deletions