Conflicts: config/locales/ru.yml config/locales/sv-SE.yml lib/open_project/costs/engine.rb lib/open_project/costs/version.rbpull/6827/head
commit
eb49a1b0e7
Loading…
Reference in new issue
Conflicts: config/locales/ru.yml config/locales/sv-SE.yml lib/open_project/costs/engine.rb lib/open_project/costs/version.rbpull/6827/head