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

f8400389

Commit f8400389 authored 14 years ago by Sarah Mei

Downloads
- Plain Diff

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

parents 81ef7386 d0055cee

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/views/devise/mailer/invitation.html.haml 1 addition, 1 deletion

app/views/devise/mailer/invitation.html.haml
app/views/invitations/_new.haml 4 additions, 2 deletions

app/views/invitations/_new.haml
app/views/people/show.html.haml 2 additions, 0 deletions

app/views/people/show.html.haml
app/views/shared/_invitations.haml 7 additions, 8 deletions

app/views/shared/_invitations.haml
lib/hcard.rb 1 addition, 1 deletion

lib/hcard.rb

with 15 additions and 12 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