Merge pull request #2786 from stevepiercy/1.7-branch

Update changes for #2785
Pylons · Oct 3, 2016 · 7b1f01f · 7b1f01f
2 parents 1c4591c + 8a77b56
commit 7b1f01f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,9 @@
 unreleased
 ==========
 
+- Update HACKING.txt from stale branch that was never merged to master.
+  See https://github.com/Pylons/pyramid/pull/2785
+
 - Fix an inconsistency in the documentation between view predicates and
   route predicates and highlight the differences in their APIs.
   See https://github.com/Pylons/pyramid/pull/2765