]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commit7af1d4e5890d6dfbf1c85093c22b9c281c0e8f55
treed5fc575f62ff3a2ee93163a26bf87ccae5ccc185
parente53e152d6f2b310d7206b640cb3840ec5531aa86
parent8e131652d675e9855bc26484f4d996944fc62337
Merge branch 'twitterannoyances' of gitorious.org:~evan/statusnet/evans-mainline into twitterannoyances

Conflicts:
plugins/TwitterBridge/TwitterBridgePlugin.php
plugins/TwitterBridge/daemons/twitterstatusfetcher.php