Merge branch 'master' of github.com:diaspora/diaspora

Browse source

Conflicts:
	spec/models/jobs/socket_webfinger_spec.rb

...

This commit is contained in:

maxwell 2011-01-18 22:47:04 -08:00

parent 72e10cfad6 02ab24335a

commit 6e65f3408d

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 is not available