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

51c5b732

Commit 51c5b732 authored 14 years ago by Raphael

Downloads
- Plain Diff

Merge branch 'empty-page'

Conflicts:
	public/stylesheets/application.css

parents 65958cf8 08e62966

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/views/albums/index.html.haml 0 additions, 6 deletions

app/views/albums/index.html.haml
app/views/aspects/_empty_messages.haml 20 additions, 0 deletions

app/views/aspects/_empty_messages.haml
app/views/aspects/index.html.haml 3 additions, 3 deletions

app/views/aspects/index.html.haml
app/views/aspects/show.html.haml 3 additions, 3 deletions

app/views/aspects/show.html.haml
app/views/js/_websocket_js.haml 18 additions, 8 deletions

app/views/js/_websocket_js.haml
app/views/shared/_aspect_friends.haml 36 additions, 25 deletions

app/views/shared/_aspect_friends.haml
config/locales/diaspora/en.yml 8 additions, 4 deletions

config/locales/diaspora/en.yml
public/javascripts/view.js 2 additions, 2 deletions

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

public/stylesheets/sass/application.sass

with 135 additions and 51 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