Conflicts: app/views/layouts/application.html.haml app/views/shared/_publisher.haml app/views/shared/_sub_header.haml app/views/users/edit.html.haml config/deploy_config.yml config/routes.rb |
||
|---|---|---|
| .. | ||
| _new_aspect.haml | ||
| index.html.haml | ||
| manage.html.haml | ||
| public.html.haml | ||
| show.html.haml | ||