-
Francisco Juan authored
Conflicts: .gitignore app/controllers/application_controller.rb app/helpers/application_helper.rb app/helpers/calendars_helper.rb app/helpers/queries_helper.rb app/helpers/reports_helper.rb app/helpers/sort_helper.rb app/views/common/_diff.rhtml app/views/common/error.html.erb app/views/help/wiki_syntax_detailed.html.erb app/views/projects/show.rhtml app/views/reports/_details.rhtml app/views/reports/_simple.rhtml app/views/repositories/_dir_list_content.rhtml app/views/search/index.rhtml app/views/versions/_issue_counts.rhtml app/views/versions/index.html.erb doc/CHANGELOG.rdoc lib/redmine/scm/adapters/subversion_adapter.rb lib/redmine/version.rb test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
e52d91fd