Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app

author Michael Vogel <icarus@dabo.de>

Sun, 29 Apr 2018 17:11:49 +0000 (19:11 +0200)

committer GitHub <noreply@github.com>

Sun, 29 Apr 2018 17:11:49 +0000 (19:11 +0200)
author Michael Vogel <icarus@dabo.de>
Sun, 29 Apr 2018 17:11:49 +0000 (19:11 +0200)
committer GitHub <noreply@github.com>
Sun, 29 Apr 2018 17:11:49 +0000 (19:11 +0200)
diff --cc boot.php
Simple merge
diff --cc include/text.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Sun, 29 Apr 2018 17:11:49 +0000 (19:11 +0200)
committer	GitHub <noreply@github.com>
	Sun, 29 Apr 2018 17:11:49 +0000 (19:11 +0200)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/text.php	patch \|	diff1 \|	diff2 \|	blob \| history