Merge branch '2.4' of https://github.com/opentx/opentx into 2.4

This commit is contained in:
Jakub
2020-01-04 20:20:13 +01:00