summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-19 12:15:27 -0400
committerChris McDonough <chrism@plope.com>2012-08-19 12:15:27 -0400
commitb9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687 (patch)
tree691d7ab28da3b26944e82c9d7df32687c63c811d /CHANGES.txt
parentdbc792498c1c8a3390c1babc1bf742def40e2b46 (diff)
downloadpyramid-b9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687.tar.gz
pyramid-b9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687.tar.bz2
pyramid-b9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687.zip
- Undo effects of merging pull #661 because tests wont pass on windows
https://github.com/Pylons/pyramid/pull/661
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index abd30c950..0291d924a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,9 +23,6 @@ Bug Fixes
https://github.com/Pylons/pyramid/issues/606
https://github.com/Pylons/pyramid/issues/607
-- ``pserve``: don't show --stop-daemon option on Windows.
- https://github.com/Pylons/pyramid/pull/661
-
Features
--------