Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Sat, 9 Mar 2019 10:51:24 +0000 (11:51 +0100)

committer Sarah Hoffmann <lonvia@denofr.de>

Sat, 9 Mar 2019 10:51:24 +0000 (11:51 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Sat, 9 Mar 2019 10:51:24 +0000 (11:51 +0100)
committer Sarah Hoffmann <lonvia@denofr.de>
Sat, 9 Mar 2019 10:51:24 +0000 (11:51 +0100)
diff --cc lib/Geocode.php
Simple merge
diff --cc lib/lib.php
Simple merge
diff --cc utils/update.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Sat, 9 Mar 2019 10:51:24 +0000 (11:51 +0100)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Sat, 9 Mar 2019 10:51:24 +0000 (11:51 +0100)
		1	2
lib/Geocode.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
utils/update.php	patch \|	diff1 \|	diff2 \|	blob \| history