81dc2ac233
* Resolve conflicts * Fixes for the merge since 2.8 and devel are quite different * Add changelog |
||
---|---|---|
.. | ||
fragments | ||
.changes.yaml | ||
CHANGELOG-v2.8.rst | ||
CHANGELOG.rst | ||
config.yaml |
81dc2ac233
* Resolve conflicts * Fixes for the merge since 2.8 and devel are quite different * Add changelog |
||
---|---|---|
.. | ||
fragments | ||
.changes.yaml | ||
CHANGELOG-v2.8.rst | ||
CHANGELOG.rst | ||
config.yaml |