Commit graph

1 commit

Author SHA1 Message Date
ilya
4ecda6ab8f Merge branch 'master' of github.com:diaspora/diaspora into invites
Conflicts:
	Gemfile
	Gemfile.lock
2010-10-07 18:20:51 -07:00