]> 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: af5b2ff 0491ee9)
Merge branch '0.8.x' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sat, 7 Nov 2009 18:01:24 +0000 (13:01 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 7 Nov 2009 18:01:24 +0000 (13:01 -0500)
Conflicts:
lib/common.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. :-)