-
Eric Davis authored
Conflicts: app/helpers/calendars_helper.rb app/helpers/issues_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/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
e950862d