diff options
| author | Heron Rossi <heron.rossi@hotmail.com> | 2018-03-09 11:24:37 -0300 |
|---|---|---|
| committer | Heron Rossi <heron.rossi@hotmail.com> | 2018-03-09 11:24:37 -0300 |
| commit | f5d1b6fff284404549a99f73a8968975ad81c0a4 (patch) | |
| tree | a05bc5bce8c5759cffd4c7b07382262e3c427a0d /docs | |
| parent | ea79cbae09cf30f8fba0ba17ee53925299ff8371 (diff) | |
| parent | d3edffe1efb6126c028d2e351908daf7ad30be60 (diff) | |
| download | pyramid-f5d1b6fff284404549a99f73a8968975ad81c0a4.tar.gz pyramid-f5d1b6fff284404549a99f73a8968975ad81c0a4.tar.bz2 pyramid-f5d1b6fff284404549a99f73a8968975ad81c0a4.zip | |
Merge branch 'master' of github.com:Pylons/pyramid into 3195_cherrypy_import
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/changes.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/changes.rst b/docs/changes.rst index fdeaf1e99..61d639a16 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -3,11 +3,11 @@ :app:`Pyramid` Change History ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. include:: ../CHANGES.txt +.. include:: ../CHANGES.rst -.. include:: ../HISTORY.txt +.. include:: ../HISTORY.rst :mod:`repoze.bfg` Change History (previous name for Pyramid) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. include:: ../BFG_HISTORY.txt +.. include:: ../BFG_HISTORY.rst |