diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-03 14:59:43 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-03 14:59:43 -0800 |
| commit | c1cfcc78fef8674430a3c20cc083b318e18a3842 (patch) | |
| tree | 5a1e1c6888f672d4b2544c542eec57ff50b828a1 /view/js | |
| parent | 2c299a9f379b9e8af33cae4270ec1c0c5cf2bc99 (diff) | |
| parent | 9fa771f9fe28a88d61ed4b269036482fcb6f5f49 (diff) | |
| download | volse-hubzilla-c1cfcc78fef8674430a3c20cc083b318e18a3842.tar.gz volse-hubzilla-c1cfcc78fef8674430a3c20cc083b318e18a3842.tar.bz2 volse-hubzilla-c1cfcc78fef8674430a3c20cc083b318e18a3842.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 1 | ||||
| -rw-r--r-- | view/js/mod_mail.js | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js index 527e6716a..8bd4357cc 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1166,7 +1166,6 @@ $(document).ready(function() { numbers : aStr['t17'], }; - $(".autotime").timeago(); $("#toc").toc(); }); diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js index 36b22138f..561df7229 100644 --- a/view/js/mod_mail.js +++ b/view/js/mod_mail.js @@ -2,4 +2,5 @@ $(document).ready(function() { $("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) { $("#recip-complete").val(data.xid); }); + $(".autotime").timeago() }); |