Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Mon, 26 Mar 2018 18:57:29 +0000 (20:57 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Mon, 26 Mar 2018 18:57:29 +0000 (20:57 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Mon, 26 Mar 2018 18:57:29 +0000 (20:57 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Mon, 26 Mar 2018 18:57:29 +0000 (20:57 +0200)
diff --cc lib/Geocode.php
Simple merge
diff --cc lib/lib.php
Simple merge
diff --cc website/reverse.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Mon, 26 Mar 2018 18:57:29 +0000 (20:57 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Mon, 26 Mar 2018 18:57:29 +0000 (20:57 +0200)
		1	2
lib/Geocode.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
website/reverse.php	patch \|	diff1 \|	diff2 \|	blob \| history