From 3795e6f3a274ef6ba290e02ac5aec8f1182846a5 Mon Sep 17 00:00:00 2001
From: rebortg <rebortg@users.noreply.github.com>
Date: Mon, 29 May 2023 06:05:36 +0000
Subject: Github: update current branch

---
 docs/_include/vyos-1x  |  2 +-
 docs/changelog/1.3.rst |  6 ------
 docs/changelog/1.4.rst | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
index d2681ea5..684c4e04 160000
--- a/docs/_include/vyos-1x
+++ b/docs/_include/vyos-1x
@@ -1 +1 @@
-Subproject commit d2681ea5929e7c3272ac74c8e565922db402758b
+Subproject commit 684c4e043f61bb186a954ffa2b49e3ebb6838a6f
diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst
index a6b361db..0dc1f411 100644
--- a/docs/changelog/1.3.rst
+++ b/docs/changelog/1.3.rst
@@ -68,12 +68,6 @@
 * :vytask:`T5097` ``(bug): the operational command "show interfaces ethernet ethx" doesn't reflect a call to 'clear counters'``
 
 
-2023-03-27
-==========
-
-* :vytask:`T4737` ``(bug): FRRouting/zebra 7.5.1 does not redistribute routes to other protocols``
-
-
 2023-03-21
 ==========
 
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index a41aad95..9e85456c 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,41 @@
    _ext/releasenotes.py
 
 
+2023-05-28
+==========
+
+* :vytask:`T5244` ``(feature): dropbear: update to 2022.83``
+* :vytask:`T5242` ``(feature): interfaces: smoketest: automatically detect "capabilities"``
+* :vytask:`T5234` ``(feature): Add bash identifier for given VRF instance``
+
+
+2023-05-25
+==========
+
+* :vytask:`T5237` ``(feature): interfaces virtual-ethernet  - Extend capabilitys of Vlans/QinQ``
+* :vytask:`T4686` ``(feature): Provides support for veth``
+
+
+2023-05-24
+==========
+
+* :vytask:`T4605` ``(feature): Firewall change default table names``
+* :vytask:`T4550` ``(feature): router-advert: Add deprecate-prefix & decrement-lifetimes options``
+
+
+2023-05-23
+==========
+
+* :vytask:`T4916` ``(feature): Rewrite IPsec authentication``
+
+
+2023-05-22
+==========
+
+* :vytask:`T5214` ``(bug): PPPoE-server incorrect warning if a named pool is defined``
+* :vytask:`T4977` ``(feature): Babel routing protocol support``
+
+
 2023-05-21
 ==========
 
-- 
cgit v1.2.3