Skip to content
Snippets Groups Projects
Commit b96e838d authored by maxwell's avatar maxwell
Browse files

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

Conflicts:
	app/models/person.rb
parents bcec2d04 ebfdaea3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment