kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-22 05:07:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop

Browse Source
This commit is contained in:
Michael Teeuw
2016-10-01 13:55:54 +02:00
parent 9dcb579741 b267491934
commit 7ed682c186
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.js.sample
View File

@@ -6,7 +6,7 @@
var config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1"],
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
language: 'en',
timeFormat: 24,

2
js/defaults.js
View File

@@ -10,7 +10,7 @@
var defaults = {
port: 8080,
kioskmode: false,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1"],
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
language: "en",
timeFormat: 24,