]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitbac959ad46e6e04bce8c29f8a24e198e62bf5616
tree3ac6ddfe248b68526c56ff8110a5c2ab5ec55d90tree | snapshot
parente61edb55d9c92c0c93de3a591928f4760b6cea16commit | diff
parent8278eca7ffe5d8c3e05fead042754640b8169411commit | 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
lib/activity.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)