diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-02-29 06:56:59 -0500 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-02-29 06:56:59 -0500 |
commit | 68554741465e92fe2e462b8de4470ddd0eb91302 (patch) | |
tree | 97fe9b7eb83b696688f3eec9cffb4dc57d2a0901 /include/acl_selectors.php | |
parent | 21d1dc48a8e83e55c55d894f85b742ef667553d7 (diff) | |
parent | fb33b4f2bcd18e63d311e6dba3aaa2ea5efdec3b (diff) | |
download | volse-hubzilla-68554741465e92fe2e462b8de4470ddd0eb91302.tar.gz volse-hubzilla-68554741465e92fe2e462b8de4470ddd0eb91302.tar.bz2 volse-hubzilla-68554741465e92fe2e462b8de4470ddd0eb91302.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
Update LICENSE
Update README
cleaned up mess created when both people request friendship and one approves as duplex
call time pass by reference deprecated
From Tobias H - catch some irregularities caused by cut/paste code
* master:
Diffstat (limited to 'include/acl_selectors.php')
0 files changed, 0 insertions, 0 deletions