• Francisco Juan's avatar
    Merge commit 'v2.7.0' into chili2 · b84517cd
    Francisco Juan authored
    Conflicts:
    	.gitignore
    	Gemfile
    	app/helpers/repositories_helper.rb
    	app/views/custom_fields/_form.rhtml
    	app/views/wiki/annotate.rhtml
    	app/views/wiki/diff.rhtml
    	app/views/wiki/show.rhtml
    	extra/svn/Redmine.pm
    b84517cd
.gitignore 562 Bytes