diff options
| author | Chris McDonough <chrism@plope.com> | 2012-10-13 19:20:23 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-10-13 19:20:23 -0400 |
| commit | 1207dbed3f2e4cc765fd2078f9c622329324ffe0 (patch) | |
| tree | ecf4a14a23095fb04637c3bc4aadfb8ce562b341 | |
| parent | 648e8ff9f631c78fa3643299c008ca98048c6779 (diff) | |
| parent | de6ec0482e4d9d3d139ccd83edf35f8438470584 (diff) | |
| download | pyramid-1207dbed3f2e4cc765fd2078f9c622329324ffe0.tar.gz pyramid-1207dbed3f2e4cc765fd2078f9c622329324ffe0.tar.bz2 pyramid-1207dbed3f2e4cc765fd2078f9c622329324ffe0.zip | |
Merge branch '1.4-branch'
| -rw-r--r-- | CHANGES.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 95375e5ba..fbac16117 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,9 @@ Features predicate as a sequence. Previously only a single string value was allowed. See https://github.com/Pylons/pyramid/pull/705 +- Comments with references to documentation sections placed in scaffold + ``.ini`` files. + Bug Fixes --------- |