Merge branch 'twitterannoyances' of gitorious.org:~evan/statusnet/evans-mainline into twitterannoyances

Browse Source

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

...

This commit is contained in:

Evan Prodromou

2010-09-07 04:27:18 -04:00

parent e53e152d6f 8e131652d6

commit 7af1d4e589

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available