Skip to content
GitLab
Explore
Sign in
Milan
diaspora
Repository
diaspora
app
controllers
users_controller.rb
Find file
Blame
History
Permalink
Merge branch 'master' of github.com:diaspora/diaspora into maxwell
· 341009e2
maxwell
authored
Oct 14, 2010
Conflicts: Gemfile Gemfile.lock spec/models/user/invite_spec.rb
341009e2