Merge pull request #1245 from lonvia/address-levels-from-json

author Sarah Hoffmann <lonvia@denofr.de>

Sat, 1 Dec 2018 20:43:53 +0000 (21:43 +0100)

committer GitHub <noreply@github.com>

Sat, 1 Dec 2018 20:43:53 +0000 (21:43 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Sat, 1 Dec 2018 20:43:53 +0000 (21:43 +0100)
committer GitHub <noreply@github.com>
Sat, 1 Dec 2018 20:43:53 +0000 (21:43 +0100)
diff --cc lib/setup/SetupClass.php
Simple merge
diff --cc sql/functions.sql
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Sat, 1 Dec 2018 20:43:53 +0000 (21:43 +0100)
committer	GitHub <noreply@github.com>
	Sat, 1 Dec 2018 20:43:53 +0000 (21:43 +0100)
		1	2
lib/setup/SetupClass.php	patch \|	diff1 \|	diff2 \|	blob \| history
sql/functions.sql	patch \|	diff1 \|	diff2 \|	blob \| history