Merge branch 'develop' into feature/service-changes

Author: DaneEveritt

resources/views/admin/nodes/view.blade.php

@@ -674,7 +674,7 @@
         memoryData.push(parseInt(data.stats.memory / (1024 * 1024)));
 
         var m = new Date();
-        timeLabels.push($.format.date(new Date(), 'HH:MM:ss'));
+        timeLabels.push($.format.date(new Date(), 'HH:mm:ss'));
 
         CPUChart.update();
         MemoryChart.update();

resources/views/server/index.blade.php

@@ -300,7 +300,7 @@
         memoryData.push(parseInt(proc.data.memory.total / (1024 * 1024)));
 
         var m = new Date();
-        timeLabels.push($.format.date(new Date(), 'HH:MM:ss'));
+        timeLabels.push($.format.date(new Date(), 'HH:mm:ss'));
 
         CPUChart.update();
         MemoryChart.update();