aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/main.js
diff options
context:
space:
mode:
authortuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-10-01 19:26:21 +0200
committertuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-10-01 19:26:21 +0200
commit9cce852ac71fcd12970e985f1f61697333849172 (patch)
treec40ce5543c412035ca03188f7bd9e565efb62117 /view/js/main.js
parenta548f644d05f330a2b70c87df821bce05007c979 (diff)
parentf19d718631675d38efca1741f46bf0916af72a65 (diff)
downloadvolse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.gz
volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.bz2
volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.zip
Merge from upstream
Diffstat (limited to 'view/js/main.js')
-rw-r--r--view/js/main.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/view/js/main.js b/view/js/main.js
index f3b252171..7d036076c 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1069,6 +1069,7 @@ function previewTheme(elm) {
}
$(document).ready(function() {
+
jQuery.timeago.settings.strings = {
prefixAgo : aStr['t01'],
prefixFromNow : aStr['t02'],