Merge pull request #3874 from tobiasd/20171009-checkversion

author Hypolite Petovan <mrpetovan@gmail.com>

Mon, 6 Nov 2017 18:59:49 +0000 (13:59 -0500)

committer GitHub <noreply@github.com>

Mon, 6 Nov 2017 18:59:49 +0000 (13:59 -0500)
author Hypolite Petovan <mrpetovan@gmail.com>
Mon, 6 Nov 2017 18:59:49 +0000 (13:59 -0500)
committer GitHub <noreply@github.com>
Mon, 6 Nov 2017 18:59:49 +0000 (13:59 -0500)
diff --cc include/cron.php
Simple merge
diff --cc mod/admin.php
Simple merge
author	Hypolite Petovan <mrpetovan@gmail.com>
	Mon, 6 Nov 2017 18:59:49 +0000 (13:59 -0500)
committer	GitHub <noreply@github.com>
	Mon, 6 Nov 2017 18:59:49 +0000 (13:59 -0500)
		1	2
include/cron.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history