kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-29 09:14:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feature/automated-weather-tests

Browse Source 
# Conflicts:
#	modules/default/weather/weather.js
#	package-lock.json
#	package.json
This commit is contained in:
fewieden
2019-09-11 13:07:31 +02:00
parent 230accd31e a77128d5f7
commit ec6d9e3521
121 changed files with 6959 additions and 4195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/configs/modules/positions.js
View File

@@ -6,7 +6,6 @@
* MIT Licensed.
*/
var config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],