From 856e977356f0a70839f323deef44671fb3f6f533 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Sun, 6 Mar 2016 10:31:10 -0500
Subject: #175 - new option to enable/disable 24hr clock in Dev settings

Former-commit-id: 86fbef04eb4f75e4c4441fa7f57821cfe4d9bfe1
---
 www/js/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'www/js/app.js')

diff --git a/www/js/app.js b/www/js/app.js
index 2914ae7a..51922d6a 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1128,7 +1128,8 @@ angular.module('zmApp', [
             // paths etc.https://github.com/pbakondy/filelogger
             $fileLogger.setStorageFilename(zm.logFile);
             // easier tz reading
-            $fileLogger.setTimestampFormat('medium');
+           // $fileLogger.setTimestampFormat('medium');
+            $fileLogger.setTimestampFormat('MMM d, y '+ZMDataModel.getTimeFormat());
 
             ZMDataModel.zmLog("Deleting old log file as it exceeds " + zm.logFileMaxSize + " bytes");
 
-- 
cgit v1.2.3