Skip to content
GitLab
Explore
Sign in
Milan
diaspora
Repository
diaspora
app
views
shared
_aspect_contacts.haml
Find file
Blame
History
Permalink
Merge branch 'master' of github.com:diaspora/diaspora
· 709e3484
maxwell
authored
Nov 23, 2010
Conflicts: spec/fixtures/users.yaml
709e3484