diff options
author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-04 15:33:51 -0400 |
---|---|---|
committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-04 15:33:51 -0400 |
commit | 7d6b289671c51694f17dd5f9849abf2534b55e59 (patch) | |
tree | 5a7a841cdacae65ea59ab965dd9d718e9e62085e /phpBB/includes/extension | |
parent | 714fafe106a1b30d299f2e29588c0d73d6ec44b5 (diff) | |
parent | 21639d5d5481ac5457e3b38bb848671f8be7b07b (diff) | |
download | forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar.gz forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar.bz2 forums-7d6b289671c51694f17dd5f9849abf2534b55e59.tar.xz forums-7d6b289671c51694f17dd5f9849abf2534b55e59.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10607] Added 'Powered by' translation string.
Conflicts:
phpBB/adm/index.php
phpBB/language/en/common.php
Diffstat (limited to 'phpBB/includes/extension')
0 files changed, 0 insertions, 0 deletions