Merge branch 'fix'

application/Espo/Tools/LabelManager/LabelManager.php

@@ -293,6 +293,10 @@ class LabelManager implements
 
         $languageObj->save();
 
+        if ($returnDataHash === []) {
+            return (object) [];
+        }
+
         return json_decode(Json::encode($returnDataHash));
     }
 }

client/src/views/fields/datetime.js

@@ -64,6 +64,8 @@ define('views/fields/datetime', ['views/fields/date', 'lib!moment'], function (D
             'HH:mm': 'H:i',
             'hh:mm A': 'h:i A',
             'hh:mm a': 'h:i a',
+            'hh:mmA': 'h:iA',
+            'hh:mma': 'h:ia',
         },
 
         data: function () {