]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e61edb5 8278eca)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Thu, 25 Feb 2010 21:40:14 +0000 (13:40 -0800)
committerZach Copley <zach@status.net>
Thu, 25 Feb 2010 21:40:14 +0000 (13:40 -0800)
* '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

1  2 
lib/activity.php patch | diff1 | diff2 | blob | history

diff --cc lib/activity.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)