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

36a5fe6b

Commit 36a5fe6b authored 14 years ago by maxwell

Downloads
- Plain Diff

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

parents 494a0e2d a1830b5d

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/albums/show.html.haml 7 additions, 2 deletions

app/views/albums/show.html.haml
app/views/photos/show.html.haml 3 additions, 8 deletions

app/views/photos/show.html.haml
public/javascripts/stream.js 0 additions, 13 deletions

public/javascripts/stream.js
public/javascripts/view.js 14 additions, 0 deletions

public/javascripts/view.js
public/stylesheets/sass/application.sass 7 additions, 1 deletion

public/stylesheets/sass/application.sass

with 31 additions and 24 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