kaizimmerm b6506380ad Merge branch 'master' into feature_boot_13_sec_41 ...

Conflicts:
	hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java
	pom.xml


Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

2016-07-27 15:29:54 +02:00

..

src

Merge branch 'master' into feature_boot_13_sec_41

2016-07-27 15:29:54 +02:00

pom.xml

Split into separate maven modules.

2016-05-25 17:43:57 +02:00