Conflicts: Gemfile.lock app/models/ability.rb app/models/project.rb app/views/snippets/_form.html.haml db/schema.rb features/steps/shared/paths.rb spec/factories.rb spec/models/project_spec.rb |
||
|---|---|---|
| .. | ||
| admin | ||
| dashboard | ||
| group | ||
| profile | ||
| project | ||
| shared | ||
| snippets | ||
| userteams | ||