Merge pull request #3224 from annando/1702-no-old_pager

author fabrixxm <fabrix.xm@gmail.com>

Tue, 14 Mar 2017 09:29:03 +0000 (10:29 +0100)

committer GitHub <noreply@github.com>

Tue, 14 Mar 2017 09:29:03 +0000 (10:29 +0100)
author fabrixxm <fabrix.xm@gmail.com>
Tue, 14 Mar 2017 09:29:03 +0000 (10:29 +0100)
committer GitHub <noreply@github.com>
Tue, 14 Mar 2017 09:29:03 +0000 (10:29 +0100)
diff --cc mod/admin.php
Simple merge
diff --cc view/templates/admin_site.tpl
Simple merge
author	fabrixxm <fabrix.xm@gmail.com>
	Tue, 14 Mar 2017 09:29:03 +0000 (10:29 +0100)
committer	GitHub <noreply@github.com>
	Tue, 14 Mar 2017 09:29:03 +0000 (10:29 +0100)
		1	2
mod/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/templates/admin_site.tpl	patch \|	diff1 \|	diff2 \|	blob \| history