diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-24 21:24:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-24 21:24:29 +0200 |
| commit | 1b3109d650acb679cb9f6b5be9bfb6097489e6d6 (patch) | |
| tree | 3f86dd542a6b13d002b1fb172182011acb1222c7 /phpBB/phpbb/template/ssh:/git@git.mageia.org/software/drakx | |
| parent | 30e1d29f5803bf5d7426096db79655f54344eaec (diff) | |
| parent | ce0c33f62a0e34a733b9da57cb41f4bf573740c2 (diff) | |
| download | forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.tar forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.tar.gz forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.tar.bz2 forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.tar.xz forums-1b3109d650acb679cb9f6b5be9bfb6097489e6d6.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13086] String replaces 50 with 20
Conflicts:
phpBB/language/en/acp/email.php
Diffstat (limited to 'phpBB/phpbb/template/ssh:/git@git.mageia.org/software/drakx')
0 files changed, 0 insertions, 0 deletions