]> 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: 029aa0c 7f9ab68)
Merge branch 'testing'
authorBrion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 17:06:52 +0000 (10:06 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 17:06:52 +0000 (10:06 -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. :-)