]> 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: 44a46de 8ea5cd0)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 25 Aug 2011 22:03:30 +0000 (18:03 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 25 Aug 2011 22:03:30 +0000 (18:03 -0400)
1  2 
lib/action.php patch | diff1 | diff2 | blob | history
plugins/Activity/ActivityPlugin.php patch | diff1 | diff2 | blob | history

diff --cc lib/action.php
Simple merge
diff --cc plugins/Activity/ActivityPlugin.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. :-)