kaizimmerm aee106b9a9 Merge branch 'master' into feature_configurable_mgmt_sim_scenario ...

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java


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

2016-06-21 12:18:32 +02:00

..

src

Merge branch 'master' into feature_configurable_mgmt_sim_scenario

2016-06-21 12:18:32 +02:00

pom.xml

Split into separate maven modules.

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