summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2017-08-28 12:05:57 -0600
committerBdale Garbee <bdale@gag.com>2017-08-28 12:05:57 -0600
commit1afcdb1f26d10f535e4467174688191b0194377e (patch)
treeee4412dae28490fb4c1d38631c2fbee9cf44a480 /doc/release-notes.inc
parent5376d4c904de57e289f12ee201690deebe34164b (diff)
parentb1cf0dab1e28433e06ab02cec033951ea0149ea3 (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 e52e36b5..adcf57ed 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -2,6 +2,10 @@
== Release Notes
:leveloffset: 2
+ include::release-notes-1.8.1.raw[]
+
+ <<<<
+ :leveloffset: 2
include::release-notes-1.8.raw[]
<<<<