From: Philipp Dallig <philipp.dallig@publicispixelpark.de>
Date: Thu, 17 Aug 2017 15:09:21 +0000 (+0200)
Subject: Merge branch 'wifi-added-FBB-403-IPs-to-unblock' into 'master'
X-Git-Tag: v0.1.0~2579^2~1
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=841156ce352079afd5b6c795e45eb7a3830cb58b;p=pixelpark%2Fhiera.git

Merge branch 'wifi-added-FBB-403-IPs-to-unblock' into 'master'

added ip's from fbb to test-fbb-wifi whitelist'

See merge request !203
---

841156ce352079afd5b6c795e45eb7a3830cb58b