Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/service-changes

Browse source
This commit is contained in:
Dane Everitt 2016-11-19 18:30:15 -05:00
commit 5a0f58ce90
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/admin/nodes/view.blade.php
View file

@ -674,7 +674,7 @@ $(document).ready(function () {
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();

2
resources/views/server/index.blade.php
View file

@ -300,7 +300,7 @@ $(window).load(function () {
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();