From 0b0c9544a33b8daee65b8173f2895d43a34c7e69 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 17 Sep 2009 08:14:56 +0000 Subject: found a much better method to skip whitespace/tab changes. :) This also solves even more unncessary conflicts - Bug #51365 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10157 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6d34d05f27..f79c7c7a9b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -243,7 +243,7 @@
  • [Change] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)
  • [Change] Resize oversized Topic icons (Bug #44415)
  • [Change] Banned IPs are now sorted (Bug #43045 - Patch by DavidIQ)
    • -
  • [Change] phpBB updater now skips sole whitespace changes. This reduces the chance of conflicts tremendously.
    • +
  • [Change] phpBB updater now skips sole whitespace/tab changes while computing differences. This reduces the chance of conflicts tremendously.
  • [Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)
  • [Feature] Backported 3.2 captcha plugins.