]> 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: 286de5a 2a3abf8)
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
authorEvan Prodromou <evan@e14n.com>
Sun, 2 Jun 2013 18:29:40 +0000 (14:29 -0400)
committerEvan Prodromou <evan@e14n.com>
Sun, 2 Jun 2013 18:29:40 +0000 (14:29 -0400)
Conflicts:
lib/useractivitystream.php


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