Merge branch 'staging' into framework

2017-09-27 12:01:18 +02:00
parent 1c791b5b51 8de1852ab9
commit 6dbc02e81a
45 changed files with 7505 additions and 3155 deletions
--- a/www/common/metadata-manager.js
+++ b/www/common/metadata-manager.js
@@ -73,7 +73,6 @@ define(['json.sortify'], function (Sortify) {
            });
        };

-        console.log('here register');
        sframeChan.on('EV_METADATA_UPDATE', function (ev) {
            meta = ev;
            if (ev.priv) {