summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris Morales <lambda.designs.cm@gmail.com>2017-05-23 12:01:18 -0700
committerChris Morales <lambda.designs.cm@gmail.com>2017-05-23 12:01:18 -0700
commit3a43ee31f02b931193c3560c196c76f5b580e701 (patch)
treee907775621ccdefb1e2e3aa97c791200fc205f11 /CHANGES.txt
parented7bad6862f5b495e3c6b55007822813d021248b (diff)
parent50d216a549bc848f411769690d722d367c91fdb4 (diff)
downloadpyramid-3a43ee31f02b931193c3560c196c76f5b580e701.tar.gz
pyramid-3a43ee31f02b931193c3560c196c76f5b580e701.tar.bz2
pyramid-3a43ee31f02b931193c3560c196c76f5b580e701.zip
Merge branch 'master' of https://github.com/Pylons/pyramid into pyramid_tm_3052
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a7cfaf0b..c21508a70 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,10 @@ unreleased
new message suggests alternatives based on the list of known predicates.
See https://github.com/Pylons/pyramid/pull/3054
+- Added integrity attributes for JavaScripts in cookiecutters, scaffolds, and
+ resulting source files in tutorials.
+ See https://github.com/Pylons/pyramid/issues/2548
+
1.9a2 (2017-05-09)
==================