diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-12-11 21:39:38 -0700 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-12-11 21:39:38 -0700 | 
| commit | 8e0b575ad1dfd5a49136d3fe945d27f6afda1178 (patch) | |
| tree | 74657870764e6a3792bdd7e90acd725353c20904 /doc/release-notes.inc | |
| parent | 132b92a95bdebabf573a680301bfb1e93eaa6721 (diff) | |
| parent | fe38c22595b050435dbacd35f1baae064fb7de75 (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'doc/release-notes.inc')
| -rw-r--r-- | doc/release-notes.inc | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/release-notes.inc b/doc/release-notes.inc index a102b2dc..1c177afa 100644 --- a/doc/release-notes.inc +++ b/doc/release-notes.inc @@ -2,6 +2,10 @@  == Release Notes  	:leveloffset: 2 +	include::release-notes-1.8.3.raw[] + +	<<<< +	:leveloffset: 2  	include::release-notes-1.8.2.raw[]  	<<<< @@ -13,7 +17,6 @@  	include::release-notes-1.8.raw[]  	<<<< -  	:leveloffset: 2  	include::release-notes-1.7.raw[]  | 
