diff options
| author | Zach Copley <zach@status.net> | 2010-02-25 13:40:14 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-25 13:40:14 -0800 |
| commit | bac959ad46e6e04bce8c29f8a24e198e62bf5616 (patch) | |
| tree | 3ac6ddfe248b68526c56ff8110a5c2ab5ec55d90 /index.php | |
| parent | e61edb55d9c92c0c93de3a591928f4760b6cea16 (diff) | |
| parent | 8278eca7ffe5d8c3e05fead042754640b8169411 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
Not sure how this ended up in wrong-cased dir...
OStatus: fix remote groups to work with new user_groups/local_groups split.
Conflicts:
classes/User_group.php
Diffstat (limited to 'index.php')
0 files changed, 0 insertions, 0 deletions