]> 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: 6b5d183 a9f5567)
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 13:20:32 +0000 (09:20 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 13:20:32 +0000 (09:20 -0400)
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. :-)