]> git.ipfire.org Git - thirdparty/babel.git/commitdiff
projects / thirdparty / babel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f60cad2 6cca5c7)
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)
`git merge -X theirs maint-25`


Trivial merge
Mirror of https://github.com/python-babel/babel.git