beremiz

Merge, with surprizingly little conflicts

2018-11-23, Edouard Tisserant
15f18dc8b56a
Merge, with surprizingly little conflicts
<?xml version="1.0" encoding="UTF-8"?>
<BeremizRoot URI_location="LOCAL://">
<TargetType/>
</BeremizRoot>