summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFenton Travers <fenton.travers@oracle.com>2014-05-06 23:28:23 -0700
committerFenton Travers <fenton.travers@oracle.com>2014-05-06 23:28:23 -0700
commit93bc46364b13723194dba62fe78dee8b358d6401 (patch)
tree1dc17ba0ee3fb5130fe9ab0d8ef189f2ae196c8c
parent6541717478e958143b73256f113cf709ebaa40d6 (diff)
downloadpyramid-93bc46364b13723194dba62fe78dee8b358d6401.tar.gz
pyramid-93bc46364b13723194dba62fe78dee8b358d6401.tar.bz2
pyramid-93bc46364b13723194dba62fe78dee8b358d6401.zip
Added required notes to changes/contributors file.
-rw-r--r--CHANGES.txt3
-rw-r--r--CONTRIBUTORS.txt2
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index c14939d81..1e2e42413 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,9 @@ Next release
- ``pyramid.wsgi.wsgiapp`` and ``pyramid.wsgi.wsgiapp2`` now raise
``ValueError`` when accidentally passed ``None``.
+- Removed non-ascii copyright symbol from templates, as this was
+ causing the scaffolds to fail for project generation.
+
1.5 (2014-04-08)
================
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d1ac72df5..c77d3e92c 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -230,3 +230,5 @@ Contributors
- Antti Haapala, 2013/11/15
- Amit Mane, 2014/01/23
+
+- Fenton Travers, 2014/05/06