]> 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: e53e152 8e13165)
Merge branch 'twitterannoyances' of gitorious.org:~evan/statusnet/evans-mainline...
authorEvan Prodromou <evan@status.net>
Tue, 7 Sep 2010 08:27:18 +0000 (04:27 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 7 Sep 2010 08:27:18 +0000 (04:27 -0400)
Conflicts:
plugins/TwitterBridge/TwitterBridgePlugin.php
plugins/TwitterBridge/daemons/twitterstatusfetcher.php


Trivial 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. :-)