]> git.mxchange.org Git - friendica.git/commit
Merge acl-var into develop
authorrabuzarus <>
Sat, 27 Jun 2015 13:23:19 +0000 (15:23 +0200)
committerrabuzarus <>
Sat, 27 Jun 2015 13:23:19 +0000 (15:23 +0200)
commit8cca849c2e9694ba9bab2e0a6173cd4f5aa2cbdc
tree86dc6b0ec32144787ca473cce2759deda6db810f
parente0f6bd6c28675159b48e33d9649b85a59924c367
parent729b7f0e72e406c7135914981cb20fc409d93e63
Merge acl-var into develop

Conflicts:
mod/settings.php
include/acl_selectors.php
mod/display.php
mod/photos.php
mod/settings.php