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

70795279

Commit 70795279 authored 14 years ago by Sarah Mei

Downloads
- Plain Diff

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

parents 73f0e17f 84e19f83

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/aspects_controller.rb 1 addition, 1 deletion

app/controllers/aspects_controller.rb
app/views/aspects/manage.html.haml 1 addition, 1 deletion

app/views/aspects/manage.html.haml
public/javascripts/aspect-edit.js 21 additions, 13 deletions

public/javascripts/aspect-edit.js

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