1 Commits (21dea9f93c485c293a9ec66553c20eeef82510c2)

Author SHA1 Message Date
Armin Ronacher 0664a3f2dd Set merge strategy for CHANGES 9 years ago