summaryrefslogtreecommitdiff
path: root/doc/release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2017-09-18 20:35:00 -0600
committerBdale Garbee <bdale@gag.com>2017-09-18 20:35:00 -0600
commitb12e982259817328e348f1aaa91c5c824891e7b9 (patch)
tree52ae2d2068fd637dd03938d592e8a7492e49ab9f /doc/release-notes.inc
parentb1cf0dab1e28433e06ab02cec033951ea0149ea3 (diff)
parente87d56b665ca30a3e5920c23cd60c99b84341aa2 (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 adcf57ed..a102b2dc 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -2,6 +2,10 @@
== Release Notes
:leveloffset: 2
+ include::release-notes-1.8.2.raw[]
+
+ <<<<
+ :leveloffset: 2
include::release-notes-1.8.1.raw[]
<<<<