19c7dc0094
Conflicts: app/controllers/application_controller.rb app/controllers/wiki_controller.rb app/helpers/issues_helper.rb app/models/time_entry.rb app/models/wiki_content.rb app/views/wiki/edit.rhtml config/locales/ja.yml test/functional/wiki_controller_test.rb
= Redmine Redmine is a flexible project management web application written using Ruby on Rails framework. More details can be found at in the doc directory or on the official website http://www.redmine.org