diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-07-03 16:52:33 -0400 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-07-03 16:52:33 -0400 |
| commit | b3bad6fc928cae56bdc3a97fe8089b27f6f79f0b (patch) | |
| tree | 64705da025631fee455c05b2419374c22e120df1 /engine/lib/river.php | |
| parent | a91f3c32d6f7295163c6421682d84689e1e7f3e5 (diff) | |
| download | elgg-b3bad6fc928cae56bdc3a97fe8089b27f6f79f0b.tar.gz elgg-b3bad6fc928cae56bdc3a97fe8089b27f6f79f0b.tar.bz2 | |
Merged d423aee393458d6827db from 1.7 to master.
Fixes #3552. Addess ACL unit tests. These currently fail because of #3522.
git-svn-id: http://code.elgg.org/elgg/branches/1.7@9202 36083f99-b078-4883-b0ff-0f9b5a30f544
Conflicts:
engine/lib/access.php
Diffstat (limited to 'engine/lib/river.php')
0 files changed, 0 insertions, 0 deletions