Commit graph

51 commits

Author SHA1 Message Date
maxwell
a742ef1253 Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	Gemfile
2010-07-16 21:33:57 -07:00