commit 74856970c6ccca1324d63f75654c7796a2deadc4 Merge: 6c737a1 4c18324 Author: juga0 juga@riseup.net Date: Tue Oct 16 13:02:07 2018 +0000

Merge branch 'ticket28040_mv_examples_docs'

CHANGELOG.md | 4 ++++ {examples => docs/examples}/config.example.ini | 0 docs/source/config.rst | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-)

diff --cc CHANGELOG.md index 9bc7631,c7d26d7..bf1bfd0 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -7,10 -7,10 +7,14 @@@ and this project adheres to [Semantic V

## [Unreleased]

+### Fixed + +- Update python minimal version in setup (#28043) + + ### Changed + + - Move ``examples/`` to ``docs/`` (#28040) + ## [0.8.0] - 2018-10-08

**Important changes**: