Merge branch 'master' into 7-localization
authorMauro Scomparin <scompo@gmail.com>
Tue, 10 Jul 2018 19:07:12 +0000 (21:07 +0200)
committerMauro Scomparin <scompo@gmail.com>
Tue, 10 Jul 2018 19:07:12 +0000 (21:07 +0200)
commite10b1880e7d8eb1c2c210353533c033b3b610db3
tree6b129a8811038f8e5f99e97750d6149a24287e91
parentf2bccc6c4616fa9e37aa41b5c758c32afbaed22b
parent2dad069c47782a732ec07f72aadf08f06015155c
Merge branch 'master' into 7-localization