summaryrefslogtreecommitdiff
path: root/doc/easymini-release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-05-06 17:59:39 -0600
committerBdale Garbee <bdale@gag.com>2016-05-06 17:59:39 -0600
commitac7be4a40df88ee3a0992e041635e4ac4cf5ac48 (patch)
treeee3c747b2ee98b772e02dce604b58878e9336def /doc/easymini-release-notes.inc
parentb53c78e75879d647935a30acb88fdd69467617a7 (diff)
parentce4c8a8ad57515e851207b0a82f3af791bb30d3e (diff)
Merge branch 'master' into branch-1.6
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 352a989b..7f578f71 100644
--- a/doc/easymini-release-notes.inc
+++ b/doc/easymini-release-notes.inc
@@ -2,6 +2,10 @@
== Release Notes
:leveloffset: 2
+ include::release-notes-1.6.3.raw[]
+
+ <<<<
+ :leveloffset: 2
include::release-notes-1.6.2.raw[]
:leveloffset: 0