Merge remote-tracking branch 'origin/development' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Sun, 18 Aug 2019 16:36:36 +0000 (18:36 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Sun, 18 Aug 2019 16:36:36 +0000 (18:36 +0200)
commitfeb82d306e86ae48cf48e93e9e96f119c8195196
tree588f7a62b2b9c5cbae592f0d7fee5962f03c52ce
parent1106ab5ecc218fd7795ccf0d861814481cf5f4fd
parent928282b9447dc92ead9f805ff7abcac46d6a137b
Merge remote-tracking branch 'origin/development' into development