From eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 28 Jul 2008 14:24:37 +0000
Subject: Okay. Frozen, we never said anything about it being permafrost. Also,
 this is not 100% tested, expect troubel with store_db (I'm waiting for the
 bug reports)

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

(limited to 'phpBB/docs')

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 310276bece..4956fd7b0e 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -53,7 +53,6 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ol style="list-style-type: lower-roman;">
-		<li><a href="#v302">Changes since 3.0.2</a></li>
 		<li><a href="#v301">Changes since 3.0.1</a></li>
 		<li><a href="#v300">Changes since 3.0.0</a></li>
 		<li><a href="#v30rc8">Changes since RC-8</a></li>
@@ -90,6 +89,8 @@
 		<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
 		<li>[Change] Display warning in ACP if config.php file is left writeable.</li>
 		<li>[Change] More restrictive chmod to new files being created.</li>
+		<li>[Feature] Allow limited inheritance for templates sets.</li>
+		<li>[Feature] Allow hard disabling of the template editor.</li>
 	</ul>
 
 	<a name="v301"></a><h3>1.ii. Changes since 3.0.1</h3>
-- 
cgit v1.2.1