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 |
||
---|---|---|
.. | ||
admin_routing_spec.rb | ||
notifications_routing_spec.rb | ||
project_routing_spec.rb | ||
routing_spec.rb |