Merge branch 'master' into develop

MagicMirrorOrg · Dec 31, 2016 · 09e6a6a · 09e6a6a
2 parents da772e6 + 65b8f78
commit 09e6a6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/js/class.js b/js/class.js
@@ -43,6 +43,7 @@
 					var ret = fn.apply(this, arguments);
 					this._super = tmp;
 
+
 					return ret;
 				};
 			})(name, prop[name]) : prop[name];

diff --git a/modules/default/newsfeed/fetcher.js b/modules/default/newsfeed/fetcher.js
@@ -81,6 +81,7 @@ var Fetcher = function(url, reloadInterval, encoding) {
 			scheduleTimer();
 		});
 
+
 		nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
 		headers =  {"User-Agent": "Mozilla/5.0 (Node.js "+ nodeVersion + ") MagicMirror/"  + global.version +  " (https://github.com/MichMich/MagicMirror/)"}
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,6 +81,7 @@ var Fetcher = function(url, reloadInterval, encoding) { @@
     			scheduleTimer();
     		});
     		nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
     		headers =  {"User-Agent": "Mozilla/5.0 (Node.js "+ nodeVersion + ") MagicMirror/"  + global.version +  " (https://github.com/MichMich/MagicMirror/)"}
@@ Expand Down @@