diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-29 03:39:07 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-29 03:39:07 -0700 |
| commit | bc02b933727da7a000d43d2d7d495f066616dc81 (patch) | |
| tree | e590b70757edb94655872f5b992f143cead61eb3 /include/acl_selectors.php | |
| parent | fc12123329133cea39f27615a7c24c57e5b4a35d (diff) | |
| parent | 7d9f785758ee6e4c19838e532f9930e227e95fc6 (diff) | |
| download | volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.gz volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.bz2 volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/acl_selectors.php')
| -rw-r--r-- | include/acl_selectors.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 0b68ba227..5adafff2c 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -248,8 +248,7 @@ function populate_acl($defaults = null,$show_jotnets = true) { '$aclModalTitle' => t('Permissions'), '$aclModalDismiss' => t('Close') )); - - + return $o; } |