Dominik Herbst 86cba3c8bf Merge branch 'master' into feature_target_filtering_supports_overdue ...

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-ui/src/main/resources/messages_de.properties
	hawkbit-ui/src/main/resources/messages_en.properties

2016-10-13 10:59:12 +02:00

..

java/org/eclipse/hawkbit/repository/jpa

Merge branch 'master' into feature_target_filtering_supports_overdue

2016-10-13 10:59:12 +02:00

resources

Started migration for Boot 1.3 and Security 4.1

2016-07-07 12:39:40 +02:00