]> 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: 4467615 f52d337)
Merge branch 'master' of gitorious.org:statusnet/mainline
authorZach Copley <zach@status.net>
Sat, 17 Sep 2011 21:39:26 +0000 (14:39 -0700)
committerZach Copley <zach@status.net>
Sat, 17 Sep 2011 21:39:26 +0000 (14:39 -0700)
* 'master' of gitorious.org:statusnet/mainline:
  problem with remote subscription on groups in OStatus
  show correct favorites link


Trivial 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. :-)