diff options
author | Dhruv <dhruv.goel92@gmail.com> | 2013-11-30 14:14:17 +0530 |
---|---|---|
committer | Dhruv <dhruv.goel92@gmail.com> | 2013-11-30 14:14:17 +0530 |
commit | 09b5499d876e98f5a7af682681198f096c0097a4 (patch) | |
tree | 33b235997e480794b91f468703f3696a41c5f5aa /phpBB/includes/diff/engine.php | |
parent | f58add8d79b04256e0f5e3e7e75d17caaddfc609 (diff) | |
parent | f3d7823050880ea6e597defefd265b32058c975b (diff) | |
download | forums-09b5499d876e98f5a7af682681198f096c0097a4.tar forums-09b5499d876e98f5a7af682681198f096c0097a4.tar.gz forums-09b5499d876e98f5a7af682681198f096c0097a4.tar.bz2 forums-09b5499d876e98f5a7af682681198f096c0097a4.tar.xz forums-09b5499d876e98f5a7af682681198f096c0097a4.zip |
Merge remote-tracking branch 'nickvergessen/ticket/12042' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12042:
[ticket/12042] Replace B with a more meaningful key name
[ticket/12042] Add all language strings from PLUpload 2.0 to the language file
Diffstat (limited to 'phpBB/includes/diff/engine.php')
0 files changed, 0 insertions, 0 deletions