summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-01 10:49:37 -0400
committerChris McDonough <chrism@plope.com>2013-10-01 10:49:37 -0400
commit5f3405096173450e43152c2d7172cca97512ac4e (patch)
tree0f6b27ad2f0244d488454c572b869a3501d2acda /CHANGES.txt
parentd65b1597ddbdfb161a0c83c46b5ebad878571c76 (diff)
parent1a76ed41b133ea73c7d40997c6f564fd72d7273e (diff)
downloadpyramid-5f3405096173450e43152c2d7172cca97512ac4e.tar.gz
pyramid-5f3405096173450e43152c2d7172cca97512ac4e.tar.bz2
pyramid-5f3405096173450e43152c2d7172cca97512ac4e.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 4c9ba4863..8b2210a99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,11 @@
+Unreleased
+==========
+
+Documentation
+-------------
+
+- Added a "Quick Tutorial" to go with the Quick Tour
+
1.5a2 (2013-09-22)
==================