From aa7703313a3c296d976d31b391301f6c7f7e620f Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Tue, 23 May 2017 03:24:19 +0200
Subject: [PATCH] Merge pull request #3058 from stevepiercy/1.8-branch

---
 CHANGES.txt |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 372d6ea..36d99b2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,10 @@
 
 - Updated pyramid-cookiecutter-starter prompts and description to include Mako. See https://github.com/Pylons/pyramid/pull/2982
 
+- Added integrity attributes for JavaScripts in cookiecutters, scaffolds, and
+  resulting source files in tutorials.
+  See https://github.com/Pylons/pyramid/issues/2548
+
 
 .. _changes_1.8.3:
 

--
Gitblit v1.9.3