summaryrefslogtreecommitdiff
path: root/doc/telegps-release-notes.inc
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2018-08-05 11:21:37 +0800
committerBdale Garbee <bdale@gag.com>2018-08-05 11:21:37 +0800
commitd8627bb7b46fc991786835afa38cd720e9e75812 (patch)
treee14ae029a4ead29a4a7ccccb39af556e32413d36 /doc/telegps-release-notes.inc
parent59e23c27c2a85d7d748223e444b24d19937afe47 (diff)
parent8830fbc99565f753c0ae1f3d9f4b079860c2634a (diff)
Merge branch 'master' into branch-1.8
Diffstat (limited to 'doc/telegps-release-notes.inc')
-rw-r--r--doc/telegps-release-notes.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/telegps-release-notes.inc b/doc/telegps-release-notes.inc
index f451c2c8..9c1353f8 100644
--- a/doc/telegps-release-notes.inc
+++ b/doc/telegps-release-notes.inc
@@ -2,6 +2,10 @@
== Release Notes
:leveloffset: 2
+ include::release-notes-1.8.6.raw[]
+
+ <<<<
+ :leveloffset: 2
include::release-notes-1.8.5.raw[]
<<<<