Merge pull request #5626 from annando/notices-oh-yeah

author Tobias Diekershoff <tobias.diekershoff@gmx.net>

Fri, 17 Aug 2018 07:33:02 +0000 (09:33 +0200)

committer GitHub <noreply@github.com>

Fri, 17 Aug 2018 07:33:02 +0000 (09:33 +0200)
author Tobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 17 Aug 2018 07:33:02 +0000 (09:33 +0200)
committer GitHub <noreply@github.com>
Fri, 17 Aug 2018 07:33:02 +0000 (09:33 +0200)
diff --cc include/api.php
Simple merge
diff --cc mod/network.php
Simple merge
author	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Fri, 17 Aug 2018 07:33:02 +0000 (09:33 +0200)
committer	GitHub <noreply@github.com>
	Fri, 17 Aug 2018 07:33:02 +0000 (09:33 +0200)
		1	2
include/api.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/network.php	patch \|	diff1 \|	diff2 \|	blob \| history