1 Commits (60eecb547d8af9916c55163c7356999ca2d5ffb9)

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