Merge branch 'staging' into framework

2017-10-18 11:42:31 +03:00
parent 15337603bb d941b1098a
commit a149152f11
10 changed files with 209 additions and 95 deletions
--- a/www/common/sframe-chainpad-netflux-inner.js
+++ b/www/common/sframe-chainpad-netflux-inner.js
@@ -135,4 +135,4 @@ define([
        });
    };
    return Object.freeze(module.exports);
-});
+});