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

Browse source

Conflicts:
	spec/controllers/services_controller_spec.rb

...

This commit is contained in:

maxwell 2010-11-08 17:47:48 -08:00

parent a84f9437b0 4164ceaf90

commit 58747df1a8

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