diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 12:03:02 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 12:03:02 +0200 |
| commit | 1a1fb4a915ba762e10a218e88ec9daa5f7d3472f (patch) | |
| tree | 51da3465f27984aa83e87aec4ecf81d2f2a85477 /phpBB/language/en/acp/common.php | |
| parent | 248b11c4db632171ff8035ae4f1842e59815fca8 (diff) | |
| parent | a58cc394bc4f88becefac6d520f680a4063fcede (diff) | |
| download | forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.tar forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.tar.gz forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.tar.bz2 forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.tar.xz forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12120] Remove imkingdavid from active authors
Conflicts:
phpBB/docs/AUTHORS
Diffstat (limited to 'phpBB/language/en/acp/common.php')
0 files changed, 0 insertions, 0 deletions