Implement merge in ts format

Julien LepillerSat Aug 24 21:50:32+0200 2019

624f5eb

offlate/doc
namelast commitdate
conf.pyInitial commitMon Apr 02 21:51:58+0200 2018
index.rstInitial commitMon Apr 02 21:51:58+0200 2018