Merge branch 'master' into 7-localization
authorMauro Scomparin <scompo@gmail.com>
Tue, 10 Jul 2018 18:57:36 +0000 (20:57 +0200)
committerMauro Scomparin <scompo@gmail.com>
Tue, 10 Jul 2018 18:57:36 +0000 (20:57 +0200)
commitf2bccc6c4616fa9e37aa41b5c758c32afbaed22b
treed8e7b72a36cec669eb901ee1d5c383fa14f779b0
parent78a6992f90bf1cab410e47ebd0e2abf39a6d6b08
parent5e4b134de4f370e24f62801ac2826f9a5ad53ed0
Merge branch 'master' into 7-localization