diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-15 13:38:38 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-15 13:41:54 +0200 |
| commit | 8b8c25194a42a365f9da5eee84fe9163dbb610d5 (patch) | |
| tree | cc1be52b29bf23a36ffb734348e553e4927d0028 /phpBB/phpbb/template/twig/tokenparser/php.php | |
| parent | dacece711b24ac0b8828b6b5d7776ab6ae7b5333 (diff) | |
| parent | f2500da8ec2c649ee59afd47fe99321e92a249e7 (diff) | |
| download | forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.tar forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.tar.gz forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.tar.bz2 forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.tar.xz forums-8b8c25194a42a365f9da5eee84fe9163dbb610d5.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12540] Fix broken placeholders in language files
Conflicts:
phpBB/language/en/common.php
phpBB/language/en/posting.php
phpBB/language/en/ucp.php
Diffstat (limited to 'phpBB/phpbb/template/twig/tokenparser/php.php')
0 files changed, 0 insertions, 0 deletions