Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Mon, 12 Feb 2018 20:21:09 +0000 (21:21 +0100)

committer Sarah Hoffmann <lonvia@denofr.de>

Mon, 12 Feb 2018 20:21:09 +0000 (21:21 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Mon, 12 Feb 2018 20:21:09 +0000 (21:21 +0100)
committer Sarah Hoffmann <lonvia@denofr.de>
Mon, 12 Feb 2018 20:21:09 +0000 (21:21 +0100)
diff --cc CMakeLists.txt
Simple merge
diff --cc lib/Geocode.php
Simple merge
diff --cc lib/lib.php
Simple merge
diff --cc sql/functions.sql
Simple merge
diff --cc utils/update.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Mon, 12 Feb 2018 20:21:09 +0000 (21:21 +0100)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Mon, 12 Feb 2018 20:21:09 +0000 (21:21 +0100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Geocode.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
sql/functions.sql	patch \|	diff1 \|	diff2 \|	blob \| history
utils/update.php	patch \|	diff1 \|	diff2 \|	blob \| history