diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-08-05 11:24:13 +0800 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-08-05 11:24:13 +0800 | 
| commit | a3b4f0d33e9d13fb5294397304ec0eb44ecaf1fc (patch) | |
| tree | 69c563070ea7ca4a127f2ac925f18a36acb888bb /doc/easymini-release-notes.inc | |
| parent | 67da03d1382228a95d0414294703371cf32e666e (diff) | |
| parent | 3a2a5a05bb6372d9003905cee7afdfcd6d38ae7e (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'doc/easymini-release-notes.inc')
| -rw-r--r-- | doc/easymini-release-notes.inc | 4 | 
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/easymini-release-notes.inc b/doc/easymini-release-notes.inc index 2d289b12..425236ef 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.6.raw[] + +	<<<< +	:leveloffset: 2  	include::release-notes-1.8.5.raw[]  	<<<<  | 
