From e7a4eb5337df3c3a7dc77ded9a973e5990a03ab2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 30 Jan 2018 18:38:56 +0100
Subject: [PATCH] docs: releases/v2017.1.5: add UBNT ERX, mention BLA fix

---
 docs/releases/v2017.1.5.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/releases/v2017.1.5.rst b/docs/releases/v2017.1.5.rst
index c5e6ed478..4cc596ab8 100644
--- a/docs/releases/v2017.1.5.rst
+++ b/docs/releases/v2017.1.5.rst
@@ -12,6 +12,7 @@ ar71xx-generic
 ramips-mt7621
 ^^^^^^^^^^^^^
 
+* Ubiquiti EdgeRouter-X
 * Ubiquiti EdgeRouter-X SFP
 
 
@@ -27,6 +28,9 @@ Bugfixes
 * Update Tunneldigger to support connections with servers running newer kernel
   versions (`9ed6ff752eb7 <https://github.com/freifunk-gluon/gluon/commit/9ed6ff752eb7972d90b138197641f12eeb4572fb>`_)
 
+* Fix batman-adv Bridge Loop Avoidance (BLA) with *gluon-ebtables-filter-multicast*
+  (`#1198 <https://github.com/freifunk-gluon/gluon/issues/1198>`_)
+
 
 Known issues
 ~~~~~~~~~~~~
-- 
GitLab