Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators

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

Fri, 9 Jun 2017 05:44:19 +0000 (07:44 +0200)

committer GitHub <noreply@github.com>

Fri, 9 Jun 2017 05:44:19 +0000 (07:44 +0200)
author Tobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 9 Jun 2017 05:44:19 +0000 (07:44 +0200)
committer GitHub <noreply@github.com>
Fri, 9 Jun 2017 05:44:19 +0000 (07:44 +0200)
diff --cc include/acl_selectors.php
Simple merge
diff --cc include/dfrn.php
Simple merge
diff --cc mod/display.php
Simple merge
author	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Fri, 9 Jun 2017 05:44:19 +0000 (07:44 +0200)
committer	GitHub <noreply@github.com>
	Fri, 9 Jun 2017 05:44:19 +0000 (07:44 +0200)
		1	2
include/acl_selectors.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/dfrn.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/display.php	patch \|	diff1 \|	diff2 \|	blob \| history