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

Browse Source

Conflicts:
	scripts/moveuser.php

...

This commit is contained in:

Evan Prodromou 2011-01-10 14:57:50 -05:00

parent 566f7c42a5 c937d3a843

commit ea8b086cb2

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