Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x

Browse Source

Conflicts:
	plugins/Realtime/realtimeupdate.js

...

This commit is contained in:

Evan Prodromou 2009-09-23 13:51:41 -04:00

parent 5152d31d2a 13976f5796

commit 480eeb1b80

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

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

Diff Content Not Available