4 commits

Author	SHA1	Message	Date
Dominik Ritter	06151eeba9	Merge remote-tracking branch 'ben/master' into HEAD	2019-02-03 19:52:29 +01:00
Dominik Ritter	40e04e053c	Parse IPs properly ... This is done if we want to show a public IP, internal IP, or a VPN. In the VPN case, what we actually want is to display an indicator that a VPN is active, instead of the VPN IP itself. We parse the IP here anyway, because we want to save some specific code there.	2019-02-03 19:20:14 +01:00
Dominik Ritter	32d3216bde	Fix tests	2019-01-22 19:18:09 +01:00
Dominik Ritter	9b73c8bd9c	Add tests	2019-01-21 19:46:53 +01:00