summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-10-03 02:38:25 -0700
committerSteve Piercy <web@stevepiercy.com>2016-10-03 02:38:25 -0700
commitf27435e8feecc78b29c58b1bd4bfd9f0b52e7e2c (patch)
tree74282d21325729987c35f3cbf0c6a2ab534eb5d1 /CHANGES.txt
parent5ffc62577d76fa4d0c9c3e915bd22eddab811465 (diff)
downloadpyramid-f27435e8feecc78b29c58b1bd4bfd9f0b52e7e2c.tar.gz
pyramid-f27435e8feecc78b29c58b1bd4bfd9f0b52e7e2c.tar.bz2
pyramid-f27435e8feecc78b29c58b1bd4bfd9f0b52e7e2c.zip
Update changes for #2782
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 63ad37c81..77129bdb1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -97,6 +97,9 @@ Deprecations
Documentation Changes
---------------------
+- Update HACKING.txt from stale branch that was never merged to master.
+ See https://github.com/Pylons/pyramid/pull/2782
+
- Updated Windows installation instructions and related bits.
See https://github.com/Pylons/pyramid/issues/2661