-
git://github.com/edavis10/redmineTim Felgentreff authored
Conflicts: app/models/wiki_content.rb app/views/wiki/history.rhtml config/locales/bg.yml config/locales/ca.yml config/locales/de.yml test/integration/api_test/projects_test.rb
859bfa62
Conflicts: app/models/wiki_content.rb app/views/wiki/history.rhtml config/locales/bg.yml config/locales/ca.yml config/locales/de.yml test/integration/api_test/projects_test.rb