summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-10-03 02:46:09 -0700
committerGitHub <noreply@github.com>2016-10-03 02:46:09 -0700
commitb081afa7278c60d0ac718df99c70e77dc8674a24 (patch)
tree74282d21325729987c35f3cbf0c6a2ab534eb5d1
parent5ffc62577d76fa4d0c9c3e915bd22eddab811465 (diff)
parentf27435e8feecc78b29c58b1bd4bfd9f0b52e7e2c (diff)
downloadpyramid-b081afa7278c60d0ac718df99c70e77dc8674a24.tar.gz
pyramid-b081afa7278c60d0ac718df99c70e77dc8674a24.tar.bz2
pyramid-b081afa7278c60d0ac718df99c70e77dc8674a24.zip
Merge pull request #2787 from stevepiercy/master
Update changes for #2782
-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