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

Browse source

Conflicts:
	app/views/blogs/_blog.html.haml

...

This commit is contained in:

maxwell 2010-06-23 14:33:55 -07:00

parent 9fa26f020e 6acee9d158

commit 9d0d8ce5e5

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