]> 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: aca6338 cb4f271)
Merge branch 'master' into testing
authorEvan Prodromou <evan@status.net>
Mon, 30 May 2011 15:18:22 +0000 (11:18 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 30 May 2011 15:18:22 +0000 (11:18 -0400)
1  2 
lib/activityimporter.php patch | diff1 | diff2 | blob | history

diff --cc lib/activityimporter.php
Simple 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. :-)