diff options
author | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:04:55 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:04:55 +0100 |
commit | 9668420554360ec215c71f85c1eb238fc9ae6a4f (patch) | |
tree | 532055f46b07af11791d35e9ceee216f296a5ea4 /phpBB/includes/diff/diff.php | |
parent | 6027541dc7c8164db2391564f1c71146ada6c813 (diff) | |
parent | 74bc2d130d5825f6f94bfbb16fa79d3e155eaadb (diff) | |
download | forums-9668420554360ec215c71f85c1eb238fc9ae6a4f.tar forums-9668420554360ec215c71f85c1eb238fc9ae6a4f.tar.gz forums-9668420554360ec215c71f85c1eb238fc9ae6a4f.tar.bz2 forums-9668420554360ec215c71f85c1eb238fc9ae6a4f.tar.xz forums-9668420554360ec215c71f85c1eb238fc9ae6a4f.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10093] Use correct ANSI code for clearing color.
[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.
[ticket/10093] Use color in commit-msg hook warning/error messages.
[ticket/10093] Refactor complaining in commit-msg hook for color support.
[ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors.
[ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
Diffstat (limited to 'phpBB/includes/diff/diff.php')
0 files changed, 0 insertions, 0 deletions