Merge pull request #1696 from rabuzarus/acl-var

author fabrixxm <fabrix.xm@gmail.com>

Mon, 29 Jun 2015 11:53:37 +0000 (13:53 +0200)

committer fabrixxm <fabrix.xm@gmail.com>

Mon, 29 Jun 2015 11:53:37 +0000 (13:53 +0200)
author fabrixxm <fabrix.xm@gmail.com>
Mon, 29 Jun 2015 11:53:37 +0000 (13:53 +0200)
committer fabrixxm <fabrix.xm@gmail.com>
Mon, 29 Jun 2015 11:53:37 +0000 (13:53 +0200)
diff --cc include/acl_selectors.php
Simple merge
diff --cc mod/photos.php
Simple merge
diff --cc mod/profile.php
Simple merge
author	fabrixxm <fabrix.xm@gmail.com>
	Mon, 29 Jun 2015 11:53:37 +0000 (13:53 +0200)
committer	fabrixxm <fabrix.xm@gmail.com>
	Mon, 29 Jun 2015 11:53:37 +0000 (13:53 +0200)
		1	2
include/acl_selectors.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/photos.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/profile.php	patch \|	diff1 \|	diff2 \|	blob \| history