summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2018-10-08 17:52:22 -0600
committerBdale Garbee <bdale@gag.com>2018-10-08 17:52:22 -0600
commit2450e69d3afd3345a6e5f7ca133d929fbdcfdf53 (patch)
treec04aa34bdecbf909dbeea8854390364bf140e7ca /doc/release-notes.inc
parent449ed72371f80f03dcc5dcf66af5c9465e7ed57e (diff)
parent5a86ff43a2b4a90dbddc1bba48019626e1b83e10 (diff)
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'doc/release-notes.inc')
-rw-r--r--doc/release-notes.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/release-notes.inc b/doc/release-notes.inc
index 693699df..1183fd12 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -1,6 +1,10 @@
[appendix]
== Release Notes
:leveloffset: 2
+ include::release-notes-1.8.7.raw[]
+
+ <<<<
+ :leveloffset: 2
include::release-notes-1.8.6.raw[]
<<<<