diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-03-18 15:50:16 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-03-18 15:50:16 -0600 | 
| commit | 55b62bb5d6a9d6b484bcd0d802964d529dd5f9bb (patch) | |
| tree | 1a93442d43fcad172879d76629d4ed47ce3d6575 /doc/easymini-release-notes.inc | |
| parent | 558d2c94fe8c49d0544a3e7bc5ba11b60c4faa1e (diff) | |
| parent | 59e23c27c2a85d7d748223e444b24d19937afe47 (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 dae928a6..2d289b12 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.5.raw[] + +	<<<< +	:leveloffset: 2  	include::release-notes-1.8.4.raw[]  	<<<<  | 
