From: rabuzarus <>
Date: Sat, 27 Jun 2015 13:23:19 +0000 (+0200)
Subject: Merge acl-var into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8cca849c2e9694ba9bab2e0a6173cd4f5aa2cbdc;p=friendica.git

Merge acl-var into develop

Conflicts:
	mod/settings.php
---

8cca849c2e9694ba9bab2e0a6173cd4f5aa2cbdc