]> 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: aa6e198 99454be)
Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sat, 20 Mar 2010 21:11:42 +0000 (16:11 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 20 Mar 2010 21:11:42 +0000 (16:11 -0500)
Conflicts:
lib/activity.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. :-)