Merged
Conversation
sync Develop
test github actions
Replace Travis with Github Actions
Unfortunately Danger Actions currently can't work with PR's: PrismJS/prism#2627
Hide alert overlay when dismissed manually
Adding SMHI as a provider for the weather module
Update dependencies incl ini
Fix changelog special character issues.
update node-ical to 0.12.4
Merging config/.gitignore with .gitignore
Fix package.json electron dependency
change node-ical version again
Update config sample
Add missing function call in module.js
# Conflicts: # CHANGELOG.md
removes undefined objects from modules array, see issue #2382
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Sync with MichMich Develop branch