summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-05-07 01:47:05 -0500
committerMichael Merickel <michael@merickel.org>2014-05-07 01:47:05 -0500
commit8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6 (patch)
treea1ffe16937711d514433bce8e2112aea0a8321d5 /CHANGES.txt
parent8f22d846af8faba71a2e20e0fb9da52ec4ec5a5e (diff)
parent93bc46364b13723194dba62fe78dee8b358d6401 (diff)
downloadpyramid-8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6.tar.gz
pyramid-8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6.tar.bz2
pyramid-8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6.zip
Merge branch 'master' of https://github.com/ftravers/pyramid into pull.1325
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index de0a4324b..0c461e550 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -35,6 +35,9 @@ Scaffolds
templates to have links to correctly versioned documentation and reflect
which pyramid was used to generate the scaffold.
+- Removed non-ascii copyright symbol from templates, as this was
+ causing the scaffolds to fail for project generation.
+
1.5 (2014-04-08)
================