Nassim 9408946b36 Merge master into abstraction (#1457)		2019-09-19 10:22:06 +01:00
..
src/main	Merge master into abstraction (#1457)	2019-09-19 10:22:06 +01:00
pom.xml	Merge dev, update 1.15 to abstraction, reduce helper mapping (#1456)	2019-09-19 09:27:48 +01:00