]> git.ipfire.org Git - thirdparty/babel.git/commit
Merge branch 'maint-25' to bring CHANGES and version up to date from 2.5.3
authorAarni Koskela <akx@iki.fi>
Mon, 15 Jan 2018 17:23:36 +0000 (19:23 +0200)
committerAarni Koskela <akx@iki.fi>
Mon, 15 Jan 2018 17:23:36 +0000 (19:23 +0200)
commit9f0ac5a0eb8301c955bfbd5a758516a2def5381e
tree7e2b852c3be378ee2ab4bfbcc6d3222757ea8347
parentf60cad28dd02ace28f495c61547e4f19a320289f
parent6cca5c736e53936b8b0d16d809382b472f5cd342
Merge branch 'maint-25' to bring CHANGES and version up to date from 2.5.3

`git merge -X theirs maint-25`