diff options
| author | Simon Birnbach <simon@simon-birnbach.de> | 2012-04-15 15:59:57 +0200 |
|---|---|---|
| committer | Simon Birnbach <simon@simon-birnbach.de> | 2012-04-15 15:59:57 +0200 |
| commit | a384fcb99fc3a12d7dac937398bf827c79e86098 (patch) | |
| tree | 55a631751578cd1f642e5fa0f88fd2290509b126 /settings/js/log.js | |
| parent | 4e89a0faf652f2f100cca47cca54a3b35e720aad (diff) | |
| parent | 38cb716a572a8af136f6260089bc486413c6ca9f (diff) | |
| download | nextcloud-server-a384fcb99fc3a12d7dac937398bf827c79e86098.tar.gz nextcloud-server-a384fcb99fc3a12d7dac937398bf827c79e86098.zip | |
Merge git://gitorious.org/owncloud/owncloud
Conflicts:
files/css/files.css
files/js/files.js
Diffstat (limited to 'settings/js/log.js')
| -rw-r--r-- | settings/js/log.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/js/log.js b/settings/js/log.js index 3814d9c10bf..ae83f0a6283 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -32,7 +32,7 @@ OC.Log={ row.append(messageTd); var timeTd=$('<td/>'); - timeTd.text(formatDate(entry.time)); + timeTd.text(formatDate(entry.time*1000)); row.append(timeTd); $('#log').append(row); } |