bcc4e4dc7e
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 |
||
---|---|---|
.. | ||
event | ||
_commit.html.haml | ||
_event.html.haml | ||
_event_issue.atom.haml | ||
_event_last_push.html.haml | ||
_event_push.atom.haml |