summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2018-10-08 17:49:47 -0600
committerBdale Garbee <bdale@gag.com>2018-10-08 17:49:47 -0600
commit34658a1236e34891b41a0a51a480717db98779e7 (patch)
tree1e29cdc000c50e4f01e5c54aa69befd8e6919524 /doc/release-notes.inc
parent3a2a5a05bb6372d9003905cee7afdfcd6d38ae7e (diff)
parent88ae4c5ebd64215f05f5efc18f9660560b409ace (diff)
Merge branch 'master' into branch-1.8
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[]
<<<<