Stefano Franz 480698bc46 Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27 ...

# Conflicts:
#	CONTRIBUTORS.md

2018-07-11 11:37:49 +01:00

..

src

Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27

2018-07-11 11:37:49 +01:00

build.gradle

ENT-2105: Remove unnecessary sourceSets from integration tests. (#1029)

2018-06-20 15:38:48 +01:00