Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

diaspora
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

eafc01de

Commit eafc01de authored 14 years ago by danielvincent

Downloads
- Plain Diff

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

parents 5ca35706 4d3da589

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile.lock 0 additions, 8 deletions

Gemfile.lock
app/helpers/aspects_helper.rb 1 addition, 1 deletion

app/helpers/aspects_helper.rb
spec/fixtures/hcard_response 48 additions, 43 deletions

spec/fixtures/hcard_response
spec/models/user/invite_spec.rb 15 additions, 6 deletions

spec/models/user/invite_spec.rb

with 64 additions and 58 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment