From 358da3d8eed6a801ec83a284cc63c5354d25ad14 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 26 Apr 2021 06:06:13 +0000
Subject: Github: update equuleus branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index ff7b2b0e..bac0405f 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit ff7b2b0e62510ef8de28c9c4bfa34badeabec775
+Subproject commit bac0405f7828f14ce336c6a029612e05ae5abf53
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index 51593dc1..75973009 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -8,6 +8,20 @@
    _ext/releasenotes.py
 
 
+2021-04-25
+==========
+
+* :vytask:`T3468` (bug): Tunnel interfaces aren't suggested as being available for bridging (regression)
+* :vytask:`T1802` (feature): Wireguard QR code in cli for mobile devices
+
+
+2021-04-23
+==========
+
+* :vytask:`T3395` (bug): WAN load-balancing fails with nexthop dhcp
+* :vytask:`T3290` (bug): Disabling GRE conntrack module fails
+
+
 2021-04-18
 ==========
 
@@ -249,7 +263,7 @@
 2021-02-16
 ==========
 
-* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.112 / 5.10.30
+* :vytask:`T3318` (feature): Update Linux Kernel to v5.4.114 / 5.10.32
 
 
 2021-02-14
-- 
cgit v1.2.3