diff options
author | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 19:29:56 +0200 |
---|---|---|
committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 19:29:56 +0200 |
commit | 1d4253319cf2a48fee43e892b3ca815b276d8f6a (patch) | |
tree | 1f261b3f235f32e271291fc27d7a6be5acc39783 /phpBB/language/en/mcp.php | |
parent | 7e2f16aafa47f8db51a12a293b0616cb75b4d12f (diff) | |
parent | 3477b5e5a8c419f28d477a4764f5d29f3b04dc79 (diff) | |
download | forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.tar forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.tar.gz forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.tar.bz2 forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.tar.xz forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
[ticket/10675] Add disk full language string when posting attachments
Diffstat (limited to 'phpBB/language/en/mcp.php')
0 files changed, 0 insertions, 0 deletions