kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-30 21:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2377 from buxxi/gitignore-merge

Browse Source 
Merging config/.gitignore with .gitignore
This commit is contained in:
Michael Teeuw 2020-12-29 16:21:47 +01:00 committed by GitHub
commit 46e77f805c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -67,6 +67,10 @@ Temporary Items
# Ignore changes to the custom css files.
/css/custom.css
# Ignore users config file but keep the sample.
/config/*
!/config/config.js.sample
# Vim
## swap
[._]*.s[a-w][a-z]

1
CHANGELOG.md
View File

@ -25,6 +25,7 @@ _This release is scheduled to be released on 2021-01-01._
### Updated
- Merging .gitignore in the config-folder with the .gitignore in the root-folder.
- Weather module - forecast now show TODAY and TOMORROW instead of weekday, to make it easier to understand.
- Update dependencies to latest versions.
- Update dependencies eslint, feedme, simple-git and socket.io to latest versions.

2
config/.gitignore vendored
View File

@ -1,2 +0,0 @@
*
!config.js.sample