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 |
||
---|---|---|
.. | ||
snippets | ||
teams | ||
_clone_panel.html.haml | ||
_errors.html.haml | ||
_settings_nav.html.haml | ||
create.js.haml | ||
edit.html.haml | ||
empty.html.haml | ||
new.html.haml | ||
show.html.haml | ||
show.js.haml | ||
transfer.js.haml | ||
update.js.haml |