Merge pull request #6487 from MrPetovan/bug/critical-fixes-after-develop-rebase
authorMichael Vogel <icarus@dabo.de>
Tue, 22 Jan 2019 14:45:33 +0000 (15:45 +0100)
committerGitHub <noreply@github.com>
Tue, 22 Jan 2019 14:45:33 +0000 (15:45 +0100)
commit73a81290ff60060d37ab33c1132e9fa9bc3cd128
tree60a3bd90cbcb1dc93245a4a0542d52edf29ef85f
parent1777c1ee4cbb9809c7c9212913175a380b8ce9ef
parent0cc1a07cfa98d5e6fdd273148aae2c0de76c3407
Merge pull request #6487 from MrPetovan/bug/critical-fixes-after-develop-rebase

Critical fixes after develop rebase