1115e10536
Conflicts: Gemfile Gemfile.lock app/assets/stylesheets/application.css.sass app/assets/templates/comment_tpl.jst.hbs app/assets/templates/stream-element_tpl.jst.hbs app/helpers/aspects_helper.rb app/helpers/contacts_helper.rb app/views/aspects/_aspect_listings.haml app/views/aspects/toggle_contact_visibility.js.erb app/views/contacts/_aspect_listings.haml app/views/layouts/_header.html.haml app/views/shared/_footer.html.haml app/views/tags/_followed_tags_listings.haml |
||
|---|---|---|
| .. | ||
| apple-splash.png | ||
| asterisk.png | ||
| asterisk_white.png | ||
| ball.png | ||
| ball_small.png | ||
| header-logo.png | ||
| header-logo2x.png | ||
| logo_caps.png | ||
| logo_large.png | ||
| logo_small.png | ||
| powered_by_diaspora.png | ||
| white.png | ||
| white2x.png | ||
| white_on_grey.png | ||
