summaryrefslogtreecommitdiff
path: root/doc/easymini-release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2017-12-21 19:05:46 -0700
committerBdale Garbee <bdale@gag.com>2017-12-21 19:05:46 -0700
commitdbb78c8222c45f4430601deee0194b0c9dc2e79a (patch)
tree6805b815727c58ad6c01f9163e42ab3177ee56d5 /doc/easymini-release-notes.inc
parentfe38c22595b050435dbacd35f1baae064fb7de75 (diff)
parent87aab99521dc44d1d29fbb0b7f227f868f074836 (diff)
Merge branch 'master' into branch-1.8
Diffstat (limited to 'doc/easymini-release-notes.inc')
-rw-r--r--doc/easymini-release-notes.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/easymini-release-notes.inc b/doc/easymini-release-notes.inc
index f4f45fd7..dae928a6 100644
--- a/doc/easymini-release-notes.inc
+++ b/doc/easymini-release-notes.inc
@@ -1,6 +1,10 @@
[appendix]
== Release Notes
:leveloffset: 2
+ include::release-notes-1.8.4.raw[]
+
+ <<<<
+ :leveloffset: 2
include::release-notes-1.8.3.raw[]
<<<<