Merge branch 'wb' into staging

2017-10-13 16:58:59 +02:00
parent 7b6432f134 5e7bf0cfb8
commit 2fd120100a
4 changed files with 85 additions and 21 deletions
--- a/www/common/sframe-chainpad-netflux-inner.js
+++ b/www/common/sframe-chainpad-netflux-inner.js
@@ -136,4 +136,4 @@ define([
        });
    };
    return Object.freeze(module.exports);
-});
+});