diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
| commit | ae3425d2dadbac69e7dcb0ba577db20e63e7d91f (patch) | |
| tree | f483759739cd951c33ef1c61ade8694f9e1c95e3 /apps/files/js | |
| parent | 3329e0f2b22207a24ddb4953bbf11964b23682d9 (diff) | |
| parent | 73685892ed6f255a916512863cd5549914d071e1 (diff) | |
| download | nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.tar.gz nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.zip | |
Merge branch 'master' into securityutils
Conflicts:
lib/private/util.php
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/filelist.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 3cbc25fc24b..fd11a80248d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -703,7 +703,7 @@ "class": "modified", "title": formatDate(mtime), "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')' - }).text( relative_modified_date(mtime / 1000) )); + }).text(OC.Util.relativeModifiedDate(mtime))); tr.find('.filesize').text(simpleSize); tr.append(td); return tr; |