Merge "Add history/changelog to docs"

2014-10-04 01:45:49 +00:00 · 2014-10-04 01:45:49 +00:00 · f7ba3df3b7
commit f7ba3df3b7
parent ce89925a0e 9498865451
2 changed files with 1 additions and 1 deletions
--- a/doc/source/history.rst
+++ b/doc/source/history.rst
@ -1,2 +1 @@
 .. include:: ../../ChangeLog
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@ -16,3 +16,4 @@ Contents
   api
   history
   contributing
   history
`@ -1,2 +1 @@`
	`.. include:: ../../ChangeLog`	`.. include:: ../../ChangeLog`