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

Merge conflict.

Browse Source
This commit is contained in:
Michael Teeuw
2019-06-14 13:19:29 +02:00
parent 60b817ec8e 62cb3a610e
commit 7a272ef0ab
70 changed files with 2261 additions and 2633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/default/calendar/vendor/ical.js/test/test.js vendored
View File

@@ -214,7 +214,7 @@ vows.describe('node-ical').addBatch({
, 'event with rrule' :{
topic: function(events){
return _.select(_.values(events), function(x){
return x.summary == "foobarTV broadcast starts"
return x.summary === "foobarTV broadcast starts"
})[0];
}
, "Has an RRULE": function(topic){
@@ -272,7 +272,7 @@ vows.describe('node-ical').addBatch({
},
'grabbing custom properties': {
topic: function(topic) {
}
}
},