mirror of
https://github.com/mtan93/homebridge.git
synced 2026-04-25 22:05:55 +01:00
merge master
This commit is contained in:
7
.gitignore
vendored
7
.gitignore
vendored
@@ -13,5 +13,12 @@ npm-debug.log
|
||||
|
||||
# HomeBridge
|
||||
config.json
|
||||
config.test.json
|
||||
persist/
|
||||
<<<<<<< HEAD
|
||||
log/
|
||||
=======
|
||||
|
||||
|
||||
.AppleDouble
|
||||
>>>>>>> master
|
||||
|
||||
Reference in New Issue
Block a user