Merge pull request #7726 from tobiasd/20191010-uexport

author Hypolite Petovan <hypolite@mrpetovan.com>

Sat, 2 Nov 2019 11:46:57 +0000 (07:46 -0400)

committer GitHub <noreply@github.com>

Sat, 2 Nov 2019 11:46:57 +0000 (07:46 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Sat, 2 Nov 2019 11:46:57 +0000 (07:46 -0400)
committer GitHub <noreply@github.com>
Sat, 2 Nov 2019 11:46:57 +0000 (07:46 -0400)
diff --cc mod/settings.php
Simple merge
diff --cc static/routes.config.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Sat, 2 Nov 2019 11:46:57 +0000 (07:46 -0400)
committer	GitHub <noreply@github.com>
	Sat, 2 Nov 2019 11:46:57 +0000 (07:46 -0400)
		1	2
mod/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history
static/routes.config.php	patch \|	diff1 \|	diff2 \|	blob \| history