36b4ce2d99
Conflicts: Gemfile Gemfile.lock app/controllers/projects/issues_controller.rb app/models/project.rb config/locales/menu.en.yml config/routes.rb db/schema.rb |
||
---|---|---|
.. | ||
controllers | ||
factories | ||
helpers | ||
mailers | ||
models | ||
routing | ||
support | ||
tests.git | ||
spec_helper.rb |