summaryrefslogtreecommitdiffstats
path: root/app/views/issues/_conflict.html.erb
Commit message (Expand)AuthorAgeFilesLines
* replace tabs to spaces at app/views/issues/_conflict.html.erbToshi MARUYAMA2012-02-051-13/+13
* Better handling of issue update conflicts (#8691).Jean-Philippe Lang2012-02-041-0/+26