diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-03 15:06:28 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-03 15:06:28 +0200 |
commit | b567c0a9e2cdb82348853aca2ea3f2e8856f8e16 (patch) | |
tree | ccb5794e200854cdc259d64adf36896d94caa681 /phpBB/includes/diff/diff.php | |
parent | 5a3d4109bbad42367d363b616e5a705ee01388e9 (diff) | |
parent | c674de6a32b89c6b8647907dd7036e5c1ad5184b (diff) | |
download | forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.tar forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.tar.gz forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.tar.bz2 forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.tar.xz forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.zip |
Merge remote-tracking branch 'vsephpbb/ticket/12043' into develop-ascraeus
* vsephpbb/ticket/12043:
[ticket/12043] Fix order of disabled extensions in unit tests
[ticket/12043] Correct try/catch exceptions for invalid extensions
[ticket/12043] Sort Extensions by Display Name in ACP Extension mananger
Diffstat (limited to 'phpBB/includes/diff/diff.php')
0 files changed, 0 insertions, 0 deletions