summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-26 15:57:28 -0500
committerChris McDonough <chrism@plope.com>2010-12-26 15:57:28 -0500
commit88b9ee766bf53ae1c46b8a1889674fea08053622 (patch)
treef4f1cfada960bbaeabe47b70782717ef71854653 /CHANGES.txt
parent74abc0fa8c4f63db0f2fef238e9ef8af16f3c8d3 (diff)
downloadpyramid-88b9ee766bf53ae1c46b8a1889674fea08053622.tar.gz
pyramid-88b9ee766bf53ae1c46b8a1889674fea08053622.tar.bz2
pyramid-88b9ee766bf53ae1c46b8a1889674fea08053622.zip
- Merge "Static Assets" chapter into the "Assets" chapter.
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt2
1 files changed, 2 insertions, 0 deletions
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)
==================