lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
Files
3b47d43dec8cf85d591fa71ff7f9fee2061e093d
hawkbit/hawkbit-ui/src/main
History
Marcel Mager (INST-IOT/ESB) 3b47d43dec Merge branch 'master' into feature_target_filtering_supports_overdue 
Conflicts:
	hawkbit-repository\hawkbit-repository-jpa\src\main\java\org\eclipse\hawkbit\repository\jpa\JpaDeploymentManagement.java
	hawkbit-repository\hawkbit-repository-jpa\src\main\java\org\eclipse\hawkbit\repository\jpa\JpaTargetManagement.java
	hawkbit-ui\src\main\java\org\eclipse\hawkbit\ui\management\targettable\TargetBeanQuery.java
	hawkbit-ui\src\main\java\org\eclipse\hawkbit\ui\management\targettable\TargetTable.java


Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
2016-10-18 12:57:10 +02:00
..
java/org/eclipse/hawkbit
Merge branch 'master' into feature_target_filtering_supports_overdue
2016-10-18 12:57:10 +02:00
resources
Merge branch 'master' into feature_target_filtering_supports_overdue
2016-10-18 12:57:10 +02:00
.gitignore
Remove and Rename modules
2016-05-18 13:48:04 +02:00