Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Tue, 27 Nov 2018 21:38:58 +0000 (22:38 +0100)

committer Sarah Hoffmann <lonvia@denofr.de>

Tue, 27 Nov 2018 21:38:58 +0000 (22:38 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Tue, 27 Nov 2018 21:38:58 +0000 (22:38 +0100)
committer Sarah Hoffmann <lonvia@denofr.de>
Tue, 27 Nov 2018 21:38:58 +0000 (22:38 +0100)
diff --cc sql/functions.sql
Simple merge
diff --cc utils/update.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Tue, 27 Nov 2018 21:38:58 +0000 (22:38 +0100)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Tue, 27 Nov 2018 21:38:58 +0000 (22:38 +0100)
		1	2
sql/functions.sql	patch \|	diff1 \|	diff2 \|	blob \| history
utils/update.php	patch \|	diff1 \|	diff2 \|	blob \| history