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

7e0825e4

Commit 7e0825e4 authored 14 years ago by maxwell

Downloads
- Plain Diff

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

parents 6a7538b2 12bdd171

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/aspects_controller.rb 3 additions, 0 deletions

app/controllers/aspects_controller.rb
app/views/shared/_publisher.haml 17 additions, 3 deletions

app/views/shared/_publisher.haml
public/javascripts/view.js 1 addition, 8 deletions

public/javascripts/view.js
public/stylesheets/sass/application.sass 10 additions, 0 deletions

public/stylesheets/sass/application.sass

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