aboutsummaryrefslogtreecommitdiff
path: root/web/app/model/Server.js
diff options
context:
space:
mode:
authorHans van den Elsen <hans.elsen@esds.nl>2016-03-14 20:49:04 +0100
committerHans van den Elsen <hans.elsen@esds.nl>2016-03-14 20:49:04 +0100
commit7fd1c08dd2f789ddd37ff075a6ebda1645947616 (patch)
tree75b715e6dd70f6be3357e1710c4db6f1f6a1e29e /web/app/model/Server.js
parent4606737cc07b736f9c8f98ae680b928c94c082c8 (diff)
parent0a1019b59481b6bf8ee8989feb23cef084b6caf5 (diff)
downloadtrackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.gz
trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.bz2
trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.zip
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'web/app/model/Server.js')
-rw-r--r--web/app/model/Server.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/web/app/model/Server.js b/web/app/model/Server.js
index 9b4b5b2b6..796ff58d6 100644
--- a/web/app/model/Server.js
+++ b/web/app/model/Server.js
@@ -54,6 +54,9 @@ Ext.define('Traccar.model.Server', {
}, {
name: 'zoom',
type: 'int'
+ }, {
+ name: 'twelveHourFormat',
+ type: 'boolean'
}],
proxy: {