Merge branch 'master' into feature_ui_metadata

Conflicts: hawkbit-ui/src/main/resources/messages.properties
2016-07-19 16:38:52 +02:00
parent ffb29206fd ba177f77c0
commit 85e22da7a2
14 changed files with 347 additions and 321 deletions
--- a/hawkbit-ui/src/main/resources/messages.properties
+++ b/hawkbit-ui/src/main/resources/messages.properties
@@ -14,7 +14,6 @@
 # Button names prefix with - button
 button.save = Save
 button.delete = Delete
-button.discard = Discard
 button.discard.all = Discard All
 button.delete.all = Delete All
 button.assign.all = Save Assign