]> 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: 033a757 71176b9)
Merge branch '1.0.x' into schema-x
authorBrion Vibber <brion@pobox.com>
Thu, 7 Oct 2010 00:16:13 +0000 (17:16 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 7 Oct 2010 00:16:13 +0000 (17:16 -0700)
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php

1  2 
plugins/OStatus/classes/Ostatus_profile.php patch | 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. :-)