From 88b9ee766bf53ae1c46b8a1889674fea08053622 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 26 Dec 2010 15:57:28 -0500
Subject: - Merge "Static Assets" chapter into the "Assets" chapter.

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'CHANGES.txt')

diff --git a/CHANGES.txt b/CHANGES.txt
index 127ea810e..e58a1dc76 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -79,6 +79,8 @@ Documentation
 
 - Move ZCML usage in Hooks chapter to Declarative Configuration chapter.
 
+- Merge "Static Assets" chapter into the "Assets" chapter.
+
 1.0a7 (2010-12-20)
 ==================
 
-- 
cgit v1.2.3