From 189e7cdf45feb3f146ce059e5c2bcc6ccd0a7391 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 12 Jan 2009 16:58:47 +0000
Subject: - Allow download of conflicting file for later reference in automatic
 updater - Default difference view is now 'inline' instead of 'side by side' -
 Added new option for merging differences to conflicting files in automatic
 updater

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9252 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/docs/CHANGELOG.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/docs')

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 282e3cf31f..d24b512709 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -89,6 +89,9 @@
 	<ul>
 		<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
 		<li>[Fix] Missing read permission from calls to phpbb_chmod()</li>
+		<li>[Change] Allow download of conflicting file for later reference in automatic updater</li>
+		<li>[Change] Default difference view is now 'inline' instead of 'side by side'</li>
+		<li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>
 	</ul>
 
 	<a name="v303"></a><h3>1.ii. Changes since 3.0.3</h3>
-- 
cgit v1.2.1