diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-27 00:39:29 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-27 00:39:29 -0500 |
| commit | 914b7349e0d85841919201c612c2499bece67f1f (patch) | |
| tree | a67b8dae393eb255165cbfa90941ca1a5f1bac71 | |
| parent | fc7f0262a0a54e8eef75b371e2504b1f979761ea (diff) | |
| parent | e14fab9210f22ffb31e8d0a51ddd3444a7f927df (diff) | |
| download | pyramid-914b7349e0d85841919201c612c2499bece67f1f.tar.gz pyramid-914b7349e0d85841919201c612c2499bece67f1f.tar.bz2 pyramid-914b7349e0d85841919201c612c2499bece67f1f.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | CHANGES.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 3e8a157c8..7060492f1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -17,7 +17,7 @@ Features - ``bpython`` interpreter compatibility in ``pshell``. See the "Command-Line Pyramid" narrative docs chapter for more information. -- Added ``get_appconfig`` function to ``pyramid.paster`` API. This function +- Added ``get_appsettings`` function to ``pyramid.paster`` API. This function returns the settings defined within an ``[app:...]`` section in a PasteDeploy ini file. |