Merge pull request #6219 from MrPetovan/task/remove-x

author Michael Vogel <icarus@dabo.de>

Sat, 1 Dec 2018 22:40:51 +0000 (23:40 +0100)

committer GitHub <noreply@github.com>

Sat, 1 Dec 2018 22:40:51 +0000 (23:40 +0100)
author Michael Vogel <icarus@dabo.de>
Sat, 1 Dec 2018 22:40:51 +0000 (23:40 +0100)
committer GitHub <noreply@github.com>
Sat, 1 Dec 2018 22:40:51 +0000 (23:40 +0100)
diff --cc mod/admin.php
Simple merge
diff --cc mod/display.php
Simple merge
diff --cc src/App.php
Simple merge
diff --cc src/Module/Magic.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Sat, 1 Dec 2018 22:40:51 +0000 (23:40 +0100)
committer	GitHub <noreply@github.com>
	Sat, 1 Dec 2018 22:40:51 +0000 (23:40 +0100)
		1	2
mod/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/display.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/App.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Module/Magic.php	patch \|	diff1 \|	diff2 \|	blob \| history