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

0afe83b5

Commit 0afe83b5 authored 14 years ago by ilya

Downloads
- Plain Diff

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

parents 02c0bf3c e9fc0860

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/views/js/_websocket_js.haml 1 addition, 1 deletion

app/views/js/_websocket_js.haml
app/views/photos/_photo.haml 2 additions, 2 deletions

app/views/photos/_photo.haml
app/views/photos/show.html.haml 7 additions, 3 deletions

app/views/photos/show.html.haml
app/views/status_messages/_status_message.html.haml 1 addition, 1 deletion

app/views/status_messages/_status_message.html.haml
public/stylesheets/sass/application.sass 5 additions, 2 deletions

public/stylesheets/sass/application.sass

with 16 additions and 9 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